From afe53927e59f9e43b48a54dc5d07223dcff88916 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 26 May 2025 16:01:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=92=8C=E8=A7=92=E8=89=B2=E5=88=86=E9=85=8D?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/database/lite/install/sys_menu.sql | 6 +- build/database/lite/install/sys_role_menu.sql | 4 + build/database/std/install/sys_menu.sql | 6 +- build/database/std/install/sys_role_menu.sql | 4 + build/database/std/upgrade/upg_sys_menu.sql | 6 +- .../std/upgrade/upg_sys_role_menu.sql | 302 ++++++++++++++++++ 6 files changed, 319 insertions(+), 9 deletions(-) create mode 100644 build/database/std/upgrade/upg_sys_role_menu.sql diff --git a/build/database/lite/install/sys_menu.sql b/build/database/lite/install/sys_menu.sql index ec23cc0c..410e77b6 100644 --- a/build/database/lite/install/sys_menu.sql +++ b/build/database/lite/install/sys_menu.sql @@ -117,10 +117,10 @@ INSERT INTO "sys_menu" VALUES (2004, 'menu.neData.imsSub', 5, 9, 'ims-sub', 'neD INSERT INTO "sys_menu" VALUES (2005, 'menu.neData.smfSub', 5, 12, 'smf-sub', 'neData/smf-sub/index', '1', '0', 'M', '1', '1', 'smf#sub:index', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588, 'system', 1728641403588, ''); INSERT INTO "sys_menu" VALUES (2006, 'menu.neData.baseOnline', 5, 15, 'base-online', 'neData/base-online/index', '1', '0', 'M', '0', '1', 'amf,mme#base-online:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, ''); INSERT INTO "sys_menu" VALUES (2007, 'menu.neData.baseStation', 5, 18, 'base-station', 'neData/base-station/index', '1', '0', 'M', '1', '1', 'amf,mme#base-station:list', 'icon-fenxiang', '0', 'system', 1728641403588, 'system', 1728641403588, ''); -INSERT INTO "sys_menu" VALUES (2008, 'menu.ueUser.n3iwf', 5, 20, 'n3iwf', 'neUser/n3iwf/index', '1', '0', 'M', '0', '1', 'n3iwf#sub:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, ''); +INSERT INTO "sys_menu" VALUES (2008, 'menu.ueUser.n3iwf', 5, 20, 'n3iwf', 'neUser/n3iwf/index', '1', '0', 'M', '1', '1', 'n3iwf#sub:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, ''); INSERT INTO "sys_menu" VALUES (2009, 'menu.neData.pcfSub', 5, 24, 'pcf-sub', 'neData/pcf-sub/index', '1', '0', 'M', '1', '1', 'pcf#sub:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, ''); -INSERT INTO "sys_menu" VALUES (2010, 'menu.neUser.nssf', 5, 26, 'nssf', 'neUser/nssf/index', '1', '0', 'M', '0', '1', 'nssf#sub:index', 'icon-daimayingyong', '0', 'system', 1728641403588, 'system', 1728641403588, ''); -INSERT INTO "sys_menu" VALUES (2011, 'menu.neUser.nssfAmf', 5, 28, 'nssfAmf', 'neUser/nssfAmf/index', '1', '0', 'M', '0', '1', 'nssf#sub:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, ''); +INSERT INTO "sys_menu" VALUES (2010, 'menu.neUser.nssf', 5, 26, 'nssf', 'neUser/nssf/index', '1', '0', 'M', '1', '1', 'nssf#sub:index', 'icon-daimayingyong', '0', 'system', 1728641403588, 'system', 1728641403588, ''); +INSERT INTO "sys_menu" VALUES (2011, 'menu.neUser.nssfAmf', 5, 28, 'nssfAmf', 'neUser/nssfAmf/index', '1', '0', 'M', '1', '1', 'nssf#sub:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, ''); INSERT INTO "sys_menu" VALUES (2083, 'menu.trace', 2087, 30, 'traceManage', '', '1', '0', 'D', '1', '1', '', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.traceRemark'); INSERT INTO "sys_menu" VALUES (2084, 'menu.trace.task', 2083, 1, 'task', 'traceManage/task/index', '1', '0', 'M', '1', '1', 'traceManage:task:index', 'icon-chexiao', '0', 'system', 1728641403588, 'system', 1744453890548, 'menu.trace.taskRemark'); INSERT INTO "sys_menu" VALUES (2085, 'menu.trace.taskData', 2083, 4, 'task/inline/data', 'traceManage/task/data', '1', '0', 'M', '0', '1', 'traceManage:task:data', '#', '0', 'system', 1728641403588, 'system', 1744453921381, ''); diff --git a/build/database/lite/install/sys_role_menu.sql b/build/database/lite/install/sys_role_menu.sql index aca3c4c7..fb6c3455 100644 --- a/build/database/lite/install/sys_role_menu.sql +++ b/build/database/lite/install/sys_role_menu.sql @@ -85,8 +85,10 @@ INSERT INTO "sys_role_menu" VALUES (2, 2003); INSERT INTO "sys_role_menu" VALUES (2, 2004); INSERT INTO "sys_role_menu" VALUES (2, 2005); INSERT INTO "sys_role_menu" VALUES (2, 2007); +INSERT INTO "sys_role_menu" VALUES (2, 2008); INSERT INTO "sys_role_menu" VALUES (2, 2009); INSERT INTO "sys_role_menu" VALUES (2, 2010); +INSERT INTO "sys_role_menu" VALUES (2, 2011); INSERT INTO "sys_role_menu" VALUES (2, 2083); INSERT INTO "sys_role_menu" VALUES (2, 2084); INSERT INTO "sys_role_menu" VALUES (2, 2086); @@ -180,8 +182,10 @@ INSERT INTO "sys_role_menu" VALUES (3, 2003); INSERT INTO "sys_role_menu" VALUES (3, 2004); INSERT INTO "sys_role_menu" VALUES (3, 2005); INSERT INTO "sys_role_menu" VALUES (3, 2007); +INSERT INTO "sys_role_menu" VALUES (3, 2008); INSERT INTO "sys_role_menu" VALUES (3, 2009); INSERT INTO "sys_role_menu" VALUES (3, 2010); +INSERT INTO "sys_role_menu" VALUES (3, 2011); INSERT INTO "sys_role_menu" VALUES (3, 2083); INSERT INTO "sys_role_menu" VALUES (3, 2086); INSERT INTO "sys_role_menu" VALUES (3, 2087); diff --git a/build/database/std/install/sys_menu.sql b/build/database/std/install/sys_menu.sql index 81587d33..af9ccf1a 100644 --- a/build/database/std/install/sys_menu.sql +++ b/build/database/std/install/sys_menu.sql @@ -120,10 +120,10 @@ INSERT INTO `sys_menu` VALUES (2004, 'menu.neData.imsSub', 5, 9, 'ims-sub', 'neD INSERT INTO `sys_menu` VALUES (2005, 'menu.neData.smfSub', 5, 12, 'smf-sub', 'neData/smf-sub/index', '1', '0', 'M', '1', '1', 'smf#sub:index', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588,'system', 1728641403588, ''); INSERT INTO `sys_menu` VALUES (2006, 'menu.neData.baseOnline', 5, 15, 'base-online', 'neData/base-online/index', '1', '0', 'M', '0', '1', 'amf,mme#base-online:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, ''); INSERT INTO `sys_menu` VALUES (2007, 'menu.neData.baseStation', 5, 18, 'base-station', 'neData/base-station/index', '1', '0', 'M', '1', '1', 'amf,mme#base-station:list', 'icon-fenxiang', '0', 'system', 1728641403588,'system', 1728641403588, ''); -INSERT INTO `sys_menu` VALUES (2008, 'menu.ueUser.n3iwf', 5, 20, 'n3iwf', 'neUser/n3iwf/index', '1', '0', 'M', '0', '1', 'n3iwf#sub:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, ''); +INSERT INTO `sys_menu` VALUES (2008, 'menu.ueUser.n3iwf', 5, 20, 'n3iwf', 'neUser/n3iwf/index', '1', '0', 'M', '1', '1', 'n3iwf#sub:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, ''); INSERT INTO `sys_menu` VALUES (2009, 'menu.neData.pcfSub', 5, 24, 'pcf-sub', 'neData/pcf-sub/index', '1', '0', 'M', '1', '1', 'pcf#sub:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, ''); -INSERT INTO `sys_menu` VALUES (2010, 'menu.neUser.nssf', 5, 26, 'nssf', 'neUser/nssf/index', '1', '0', 'M', '0', '1', 'nssf#sub:index', 'icon-daimayingyong', '0', 'system', 1728641403588,'system', 1728641403588, ''); -INSERT INTO `sys_menu` VALUES (2011, 'menu.neUser.nssfAmf', 5, 28, 'nssfAmf', 'neUser/nssfAmf/index', '1', '0', 'M', '0', '1', 'nssf#sub:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, ''); +INSERT INTO `sys_menu` VALUES (2010, 'menu.neUser.nssf', 5, 26, 'nssf', 'neUser/nssf/index', '1', '0', 'M', '1', '1', 'nssf#sub:index', 'icon-daimayingyong', '0', 'system', 1728641403588,'system', 1728641403588, ''); +INSERT INTO `sys_menu` VALUES (2011, 'menu.neUser.nssfAmf', 5, 28, 'nssfAmf', 'neUser/nssfAmf/index', '1', '0', 'M', '1', '1', 'nssf#sub:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, ''); INSERT INTO `sys_menu` VALUES (2083, 'menu.trace', 2087, 30, 'traceManage', '', '1', '0', 'D', '1', '1', '', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.traceRemark'); INSERT INTO `sys_menu` VALUES (2084, 'menu.trace.task', 2083, 1, 'task', 'traceManage/task/index', '1', '0', 'M', '1', '1', 'traceManage:task:index', 'icon-chexiao', '0', 'system', 1728641403588, 'system', 1744453890548, 'menu.trace.taskRemark'); INSERT INTO `sys_menu` VALUES (2085, 'menu.trace.taskData', 2083, 4, 'task/inline/data', 'traceManage/task/data', '1', '0', 'M', '0', '1', 'traceManage:task:data', '#', '0', 'system', 1728641403588, 'system', 1744453921381, ''); diff --git a/build/database/std/install/sys_role_menu.sql b/build/database/std/install/sys_role_menu.sql index d942ee3f..ebbd4896 100644 --- a/build/database/std/install/sys_role_menu.sql +++ b/build/database/std/install/sys_role_menu.sql @@ -92,7 +92,9 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2004); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2005); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2007); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2009); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2008); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2010); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2011); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2083); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2084); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2086); @@ -186,8 +188,10 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2003); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2004); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2005); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2007); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2008); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2009); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2010); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2011); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2083); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2086); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2087); diff --git a/build/database/std/upgrade/upg_sys_menu.sql b/build/database/std/upgrade/upg_sys_menu.sql index 7ea3c822..b083b531 100644 --- a/build/database/std/upgrade/upg_sys_menu.sql +++ b/build/database/std/upgrade/upg_sys_menu.sql @@ -142,10 +142,10 @@ REPLACE INTO `sys_menu` VALUES (2004, 'menu.neData.imsSub', 5, 9, 'ims-sub', 'ne REPLACE INTO `sys_menu` VALUES (2005, 'menu.neData.smfSub', 5, 12, 'smf-sub', 'neData/smf-sub/index', '1', '0', 'M', '1', '1', 'smf#sub:index', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588,'system', 1728641403588, ''); REPLACE INTO `sys_menu` VALUES (2006, 'menu.neData.baseOnline', 5, 15, 'base-online', 'neData/base-online/index', '1', '0', 'M', '0', '1', 'amf,mme#base-online:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, ''); REPLACE INTO `sys_menu` VALUES (2007, 'menu.neData.baseStation', 5, 18, 'base-station', 'neData/base-station/index', '1', '0', 'M', '1', '1', 'amf,mme#base-station:list', 'icon-fenxiang', '0', 'system', 1728641403588,'system', 1728641403588, ''); -REPLACE INTO `sys_menu` VALUES (2008, 'menu.ueUser.n3iwf', 5, 20, 'n3iwf', 'neUser/n3iwf/index', '1', '0', 'M', '0', '1', 'n3iwf#sub:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, ''); +REPLACE INTO `sys_menu` VALUES (2008, 'menu.ueUser.n3iwf', 5, 20, 'n3iwf', 'neUser/n3iwf/index', '1', '0', 'M', '1', '1', 'n3iwf#sub:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, ''); REPLACE INTO `sys_menu` VALUES (2009, 'menu.neData.pcfSub', 5, 24, 'pcf-sub', 'neData/pcf-sub/index', '1', '0', 'M', '1', '1', 'pcf#sub:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, ''); -REPLACE INTO `sys_menu` VALUES (2010, 'menu.neUser.nssf', 5, 26, 'nssf', 'neUser/nssf/index', '1', '0', 'M', '0', '1', 'nssf#sub:index', 'icon-daimayingyong', '0', 'system', 1728641403588,'system', 1728641403588, ''); -REPLACE INTO `sys_menu` VALUES (2011, 'menu.neUser.nssfAmf', 5, 28, 'nssfAmf', 'neUser/nssfAmf/index', '1', '0', 'M', '0', '1', 'nssf#sub:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, ''); +REPLACE INTO `sys_menu` VALUES (2010, 'menu.neUser.nssf', 5, 26, 'nssf', 'neUser/nssf/index', '1', '0', 'M', '1', '1', 'nssf#sub:index', 'icon-daimayingyong', '0', 'system', 1728641403588,'system', 1728641403588, ''); +REPLACE INTO `sys_menu` VALUES (2011, 'menu.neUser.nssfAmf', 5, 28, 'nssfAmf', 'neUser/nssfAmf/index', '1', '0', 'M', '1', '1', 'nssf#sub:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, ''); REPLACE INTO `sys_menu` VALUES (2083, 'menu.trace', 2087, 30, 'traceManage', '', '1', '0', 'D', '1', '1', '', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.traceRemark'); REPLACE INTO `sys_menu` VALUES (2084, 'menu.trace.task', 2083, 1, 'task', 'traceManage/task/index', '1', '0', 'M', '1', '1', 'traceManage:task:index', 'icon-chexiao', '0', 'system', 1728641403588, 'system', 1744453890548, 'menu.trace.taskRemark'); REPLACE INTO `sys_menu` VALUES (2085, 'menu.trace.taskData', 2083, 4, 'task/inline/data', 'traceManage/task/data', '1', '0', 'M', '0', '1', 'traceManage:task:data', '#', '0', 'system', 1728641403588, 'system', 1744453921381, ''); diff --git a/build/database/std/upgrade/upg_sys_role_menu.sql b/build/database/std/upgrade/upg_sys_role_menu.sql new file mode 100644 index 00000000..e236b3e4 --- /dev/null +++ b/build/database/std/upgrade/upg_sys_role_menu.sql @@ -0,0 +1,302 @@ +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for sys_role_menu +-- ---------------------------- +CREATE TABLE IF NOT EXISTS `sys_role_menu` ( + `role_id` bigint(20) NOT NULL COMMENT '角色ID', + `menu_id` bigint(20) NOT NULL COMMENT '菜单ID', + PRIMARY KEY (`role_id`, `menu_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统_角色和菜单关联表' ROW_FORMAT = Dynamic; + +-- +-- Dumping data for table `sys_role_menu` +-- + +LOCK TABLES `sys_role_menu` WRITE; + +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 4); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 5); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 60); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 61); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 63); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 64); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 65); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 66); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 100); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 101); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 102); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 103); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 104); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 105); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 108); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 111); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 112); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 115); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 116); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 117); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 500); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 501); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1000); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1001); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1002); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1003); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1004); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1005); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1006); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1007); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1008); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1009); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1010); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1011); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1012); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1013); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1014); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1015); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1016); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1017); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1018); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1019); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1020); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1021); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1022); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1023); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1024); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1030); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1032); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1034); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1039); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1040); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1041); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1042); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1043); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1044); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1045); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1048); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1049); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1050); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1051); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1052); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1053); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1054); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1055); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1056); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2000); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2001); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2002); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2003); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2004); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2005); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2007); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2009); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2008); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2010); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2011); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2083); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2084); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2086); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2087); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2088); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2089); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2091); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2092); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2094); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2096); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2097); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2099); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2100); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2101); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2102); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2103); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2104); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2105); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2107); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2108); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2109); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2112); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2113); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2114); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2115); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2116); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2117); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2118); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2121); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2122); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2123); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2126); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2128); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2129); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2130); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2131); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2132); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2133); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2137); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2138); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2140); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2141); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2142); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2143); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2145); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2146); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2147); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2148); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2149); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2150); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2151); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2152); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2153); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2154); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2155); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2156); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2157); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2158); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2159); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2160); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2162); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2163); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2164); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2165); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2166); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2167); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2168); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2169); + +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 4); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 5); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 60); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 65); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 66); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 108); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 112); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 115); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 500); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 501); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1030); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1032); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1034); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1039); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1042); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1048); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2000); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2001); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2002); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2003); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2004); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2005); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2007); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2008); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2009); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2010); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2011); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2083); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2086); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2087); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2088); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2089); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2091); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2092); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2094); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2097); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2107); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2108); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2109); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2111); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2113); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2114); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2115); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2116); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2123); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2126); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2128); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2129); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2130); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2131); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2132); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2133); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2137); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2138); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2140); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2141); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2143); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2146); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2147); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2148); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2149); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2151); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2152); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2153); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2154); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2155); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2156); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2157); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2158); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2165); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2166); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2167); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2168); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2169); + +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 4); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 60); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 65); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 66); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 112); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 115); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 500); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 501); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1039); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1041); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1042); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1044); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1048); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2083); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2086); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2087); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2088); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2089); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2092); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2094); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2097); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2113); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2114); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2116); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2126); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2128); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2129); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2130); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2131); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2132); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2133); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2138); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2140); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2141); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2147); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2148); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2149); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2151); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2152); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2153); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2157); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2163); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2165); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2166); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2167); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2168); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2169); + +INSERT IGNORE INTO `sys_role_menu` VALUES (5, 1); +INSERT IGNORE INTO `sys_role_menu` VALUES (5, 4); +INSERT IGNORE INTO `sys_role_menu` VALUES (5, 112); +INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2087); +INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2115); +INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2131); +INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2132); +INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2165); + +UNLOCK TABLES; + +-- Dump completed on 2025-02-14 15:26:56 From d080dcd36748b543b34d57f48106b52656652f3a Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 29 May 2025 14:50:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E6=BF=80=E6=B4=BB?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=A0=81=E6=8F=90=E5=8F=96=E4=B8=A4=E8=A1=8C?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=BF=80=E6=B4=BB=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/network_element/controller/ne_license.go | 5 ++++- src/modules/network_element/service/ne_license.go | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/modules/network_element/controller/ne_license.go b/src/modules/network_element/controller/ne_license.go index 64bc1a84..ca6fb04e 100644 --- a/src/modules/network_element/controller/ne_license.go +++ b/src/modules/network_element/controller/ne_license.go @@ -2,6 +2,7 @@ package controller import ( "fmt" + "strings" "github.com/gin-gonic/gin" @@ -265,7 +266,9 @@ func (s *NeLicenseController) State(c *gin.Context) { neLicense.ExpiryDate = fmt.Sprint(neState["expire"]) } else { neLicense.Status = "0" - // 更新授权码 + } + // 更新授权码 + if neLicense.ActivationRequestCode == "" || strings.HasPrefix(neLicense.ActivationRequestCode, "SN") { code, licensePath := s.neLicenseService.ReadLicenseInfo(neLicense) neLicense.ActivationRequestCode = code neLicense.LicensePath = licensePath diff --git a/src/modules/network_element/service/ne_license.go b/src/modules/network_element/service/ne_license.go index 4173aa40..a3961ebb 100644 --- a/src/modules/network_element/service/ne_license.go +++ b/src/modules/network_element/service/ne_license.go @@ -136,7 +136,13 @@ func (r *NeLicense) ReadLicenseInfo(neLicense model.NeLicense) (string, string) if err = sftpClient.CopyFileRemoteToLocal(nePath+"/system.ini", omcPath+"/system.ini"); err == nil { licensePath = omcPath + "/system.ini" } - return strings.TrimSpace(string(bytes)), licensePath + + activationRequestCode := string(bytes) + parts := strings.SplitAfter(string(bytes), "\n") + if len(parts) > 1 { + activationRequestCode = parts[1] // 获取 \n 后的内容 + } + return strings.TrimSpace(activationRequestCode), licensePath } // UploadLicense 授权文件上传到网元主机 From ba45cd601c36ff703836972d880419e904f35041 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 29 May 2025 15:01:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0ne=5Flist=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=9A=84=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3SQL=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/database/lite/install/trace_task.sql | 2 +- build/database/lite/upgrade/upg_trace_task.sql | 11 ++++++++--- build/database/std/install/trace_task.sql | 2 +- build/database/std/upgrade/upg_trace_task.sql | 5 +++-- src/modules/network_element/fetch_link/ne_trace.go | 2 +- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/build/database/lite/install/trace_task.sql b/build/database/lite/install/trace_task.sql index b6d4dbaf..5b11b415 100644 --- a/build/database/lite/install/trace_task.sql +++ b/build/database/lite/install/trace_task.sql @@ -17,7 +17,7 @@ CREATE TABLE "trace_task" ( "create_time" integer, "title" text(255), "remark" text(500), - "ne_list" text(32) NOT NULL, + "ne_list" text(255) NOT NULL, "notify_url" text(128) NOT NULL, PRIMARY KEY ("id") ); diff --git a/build/database/lite/upgrade/upg_trace_task.sql b/build/database/lite/upgrade/upg_trace_task.sql index 7eb078c6..5f2d45a7 100644 --- a/build/database/lite/upgrade/upg_trace_task.sql +++ b/build/database/lite/upgrade/upg_trace_task.sql @@ -1,6 +1,7 @@ -- ---------------------------- -- Table structure for trace_task -- ---------------------------- +ALTER TABLE "trace_task" RENAME TO "trace_task_old"; CREATE TABLE IF NOT EXISTS "trace_task" ( "id" integer NOT NULL, "trace_id" text(16) NOT NULL, @@ -16,7 +17,7 @@ CREATE TABLE IF NOT EXISTS "trace_task" ( "create_time" integer, "title" text(255), "remark" text(500), - "ne_list" text(32) NOT NULL, + "ne_list" text(255) NOT NULL, "notify_url" text(128) NOT NULL, PRIMARY KEY ("id") ); @@ -26,5 +27,9 @@ CREATE TABLE IF NOT EXISTS "trace_task" ( -- ---------------------------- --- ADD COLUMN -ALTER TABLE trace_task ADD COLUMN title text(255); +-- ---------------------------- +-- COLUMN for trace_task +-- ---------------------------- +-- ALTER TABLE trace_task ADD COLUMN title text(255); +INSERT INTO "trace_task" ("id", "trace_id", "trace_type", "start_time", "end_time", "interfaces", "imsi", "msisdn", "src_ip", "dst_ip", "create_by", "create_time", "title", "remark", "ne_list", "notify_url") SELECT "id", "trace_id", "trace_type", "start_time", "end_time", "interfaces", "imsi", "msisdn", "src_ip", "dst_ip", "create_by", "create_time", "title", "remark", "ne_list", "notify_url" FROM "trace_task_old"; +DROP TABLE IF EXISTS "trace_task_old"; diff --git a/build/database/std/install/trace_task.sql b/build/database/std/install/trace_task.sql index 58a5af84..11083ce0 100644 --- a/build/database/std/install/trace_task.sql +++ b/build/database/std/install/trace_task.sql @@ -18,7 +18,7 @@ CREATE TABLE `trace_task` ( `create_time` bigint DEFAULT '0' COMMENT '创建时间', `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '任务标题', `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '备注', - `ne_list` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neType_neId 例如 UDM_001,AMF_001', + `ne_list` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neType_neId 例如 UDM_001,AMF_001', `notify_url` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '信息数据通知回调地址UDP 例如udp:192.168.5.58:33033', PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='跟踪_任务'; diff --git a/build/database/std/upgrade/upg_trace_task.sql b/build/database/std/upgrade/upg_trace_task.sql index bcbc58f3..3f5ce2d3 100644 --- a/build/database/std/upgrade/upg_trace_task.sql +++ b/build/database/std/upgrade/upg_trace_task.sql @@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `trace_task` ( `create_time` bigint DEFAULT '0' COMMENT '创建时间', `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '任务标题', `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '备注', - `ne_list` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neType_neId 例如 UDM_001,AMF_001', + `ne_list` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neType_neId 例如 UDM_001,AMF_001', `notify_url` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '信息数据通知回调地址UDP 例如udp:192.168.5.58:33033', PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='跟踪_任务'; @@ -33,7 +33,8 @@ ALTER TABLE `trace_task` DROP COLUMN `ne_id`; ALTER TABLE `trace_task` DROP COLUMN `fetch_msg`; ALTER TABLE `trace_task` MODIFY COLUMN `trace_type` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '1-Interface,2-Device,3-UE' AFTER `trace_id`; ALTER TABLE `trace_task` ADD COLUMN `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '任务标题' AFTER `create_time`; -ALTER TABLE `trace_task` ADD COLUMN `ne_list` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neType_neId 例如 UDM_001,AMF_001' AFTER `remark`; +ALTER TABLE `trace_task` ADD COLUMN `ne_list` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neType_neId 例如 UDM_001,AMF_001' AFTER `remark`; +ALTER TABLE `trace_task` MODIFY COLUMN `ne_list` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neType_neId 例如 UDM_001,AMF_001' AFTER `remark`; ALTER TABLE `trace_task` MODIFY COLUMN `notify_url` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '信息数据通知回调地址UDP 例如udp:192.168.5.58:33033' AFTER `ne_list`; -- Dump completed on 2025-04-14 14:26:59 diff --git a/src/modules/network_element/fetch_link/ne_trace.go b/src/modules/network_element/fetch_link/ne_trace.go index b31117ae..fe708348 100644 --- a/src/modules/network_element/fetch_link/ne_trace.go +++ b/src/modules/network_element/fetch_link/ne_trace.go @@ -18,8 +18,8 @@ func NeTraceAdd(neInfo model.NeInfo, data any) (map[string]any, error) { var resData map[string]any if err != nil { errStr := err.Error() - logger.Warnf("NeTraceAdd POST \"%s\"", neUrl) if !(strings.HasPrefix(errStr, "201") || strings.HasPrefix(errStr, "400")) { + logger.Warnf("NeTraceAdd POST \"%s\"", neUrl) logger.Errorf("NeTraceAdd %s", errStr) return nil, fmt.Errorf("NeService Trace Add API Error") } From 88da71b9d56499e45e65e43251459ede1da402eb Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 29 May 2025 15:27:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?style:=20=E7=9B=AE=E5=BD=95=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E5=92=8C=E5=BC=95?= =?UTF-8?q?=E5=AF=BC=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/auth/auth.go | 12 ------------ src/modules/common/common.go | 12 ++++++++++++ .../{auth => common}/controller/bootloader.go | 0 src/modules/{auth => common}/controller/sys_conf.go | 0 4 files changed, 12 insertions(+), 12 deletions(-) rename src/modules/{auth => common}/controller/bootloader.go (100%) rename src/modules/{auth => common}/controller/sys_conf.go (100%) diff --git a/src/modules/auth/auth.go b/src/modules/auth/auth.go index cf01e504..11e64407 100644 --- a/src/modules/auth/auth.go +++ b/src/modules/auth/auth.go @@ -12,18 +12,6 @@ import ( func Setup(router *gin.Engine) { logger.Infof("开始加载 ====> auth 模块路由") - // 系统可暴露的配置信息 - router.GET("/sys-conf", controller.NewSysConf.Handler) - - // 系统引导初始化 - guideGroup := router.Group("/bootloader") - { - guideGroup.POST("", controller.NewBootloader.Start) - guideGroup.PUT("", middleware.AuthorizeUser(nil), controller.NewBootloader.Done) - guideGroup.DELETE("", middleware.AuthorizeUser(nil), controller.NewBootloader.Reset) - guideGroup.PUT("/account", middleware.AuthorizeUser(nil), controller.NewBootloader.Account) - } - // 验证码操作 router.GET("/captcha-image", middleware.RateLimit(middleware.LimitOption{ diff --git a/src/modules/common/common.go b/src/modules/common/common.go index e85c96ad..c4062426 100644 --- a/src/modules/common/common.go +++ b/src/modules/common/common.go @@ -52,4 +52,16 @@ func Setup(router *gin.Engine) { fileGroup.DELETE("", middleware.AuthorizeUser(nil), controller.NewFile.Remove) fileGroup.POST("/transfer-static-file", middleware.AuthorizeUser(nil), controller.NewFile.TransferStaticFile) } + + // 系统可暴露的配置信息 + router.GET("/sys-conf", controller.NewSysConf.Handler) + + // 系统引导初始化 + guideGroup := router.Group("/bootloader") + { + guideGroup.POST("", controller.NewBootloader.Start) + guideGroup.PUT("", middleware.AuthorizeUser(nil), controller.NewBootloader.Done) + guideGroup.DELETE("", middleware.AuthorizeUser(nil), controller.NewBootloader.Reset) + guideGroup.PUT("/account", middleware.AuthorizeUser(nil), controller.NewBootloader.Account) + } } diff --git a/src/modules/auth/controller/bootloader.go b/src/modules/common/controller/bootloader.go similarity index 100% rename from src/modules/auth/controller/bootloader.go rename to src/modules/common/controller/bootloader.go diff --git a/src/modules/auth/controller/sys_conf.go b/src/modules/common/controller/sys_conf.go similarity index 100% rename from src/modules/auth/controller/sys_conf.go rename to src/modules/common/controller/sys_conf.go