diff --git a/database/install/sys_config.sql b/database/install/sys_config.sql index 4049e75c..82e6f4d5 100644 --- a/database/install/sys_config.sql +++ b/database/install/sys_config.sql @@ -38,7 +38,7 @@ INSERT INTO `sys_config` VALUES (104, 'config.sys.logo.filePathBrand', 'sys.logo INSERT INTO `sys_config` VALUES (105, 'config.sys.loginBackground', 'sys.loginBackground', '#', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.loginBackgroundRemark'); INSERT INTO `sys_config` VALUES (106, 'config.sys.title', 'sys.title', 'config.sys.titleValue', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.titleRemark'); INSERT INTO `sys_config` VALUES (107, 'config.sys.copyright', 'sys.copyright', 'config.sys.copyrightValue', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.copyrightRemark'); -INSERT INTO `sys_config` VALUES (108, 'config.sys.i18nOpen', 'sys.i18n.open', 'true', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.i18nOpenRemark'); +INSERT INTO `sys_config` VALUES (108, 'config.sys.i18nOpen', 'sys.i18n.open', 'false', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.i18nOpenRemark'); INSERT INTO `sys_config` VALUES (109, 'config.sys.i18nDefault', 'sys.i18n.default', 'en_US', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.i18nDefaultRemark'); INSERT INTO `sys_config` VALUES (110, 'config.sys.lockTime', 'sys.lockTime', '0', 'Y', 'supervisor', 1704960008300, 'admin', 1706838764703, 'config.sys.lockTimeRemark'); INSERT INTO `sys_config` VALUES (111, 'config.sys.homePage', 'sys.homePage', 'dashboard/overview/index', 'Y', 'supervisor', 1704960008300, 'admin', 1706838764703, 'config.sys.homePageRemark'); diff --git a/database/install/sys_menu.sql b/database/install/sys_menu.sql index e95dfccb..3b7f494b 100644 --- a/database/install/sys_menu.sql +++ b/database/install/sys_menu.sql @@ -139,8 +139,8 @@ INSERT INTO `sys_menu` VALUES (2011, 'menu.ueUser.voipUDM', 5, 3, 'voip', 'neUse INSERT INTO `sys_menu` VALUES (2012, 'menu.ueUser.imsUDM', 5, 4, 'imsUDM', 'neUser/imsUDM/index', '1', '1', 'M', '1', '1', 'neUser:imsUDM:index', 'icon-xiangmuchengyuan', 'supervisor', 1700000000000, NULL, 0, 'menu.ueUser.imsUDMRemark'); INSERT INTO `sys_menu` VALUES (2013, 'menu.log', 2089, 27, 'logsD', '', '1', '0', 'D', '1', '1', '', 'icon-wenjian', 'supervisor', 1700000000000, 'supervisor', 1715413568692, ''); INSERT INTO `sys_menu` VALUES (2074, 'KPI Indicator Management', 2099, 22, 'kpi-title', 'perfManage/kpi-title/index', '1', '1', 'M', '1', '1', 'perfManage:kpi-title:index', 'icon-soutubiao', 'supervisor', 1700000000000, NULL, 0, ''); -INSERT INTO `sys_menu` VALUES (2075, 'Dashboard2', 2087, 9, 'dashboard2', 'dashboard/overview2/index', '1', '0', 'M', '1', '1', 'dashboard:overview2:index', 'icon-paixu', 'supervisor', 1705550000000, NULL, 0, NULL); -INSERT INTO `sys_menu` VALUES (2076, 'Alarm Overview', 2129, 6, 'alarm-overview', 'faultManage/alarm-overview/index', '1', '1', 'M', '1', '1', 'faultManage:active-overview:index', 'icon-wenjian', 'supervisor', 1724144595914, '', 0, ''); +-- INSERT INTO `sys_menu` VALUES (2075, 'Dashboard2', 2087, 9, 'dashboard2', 'dashboard/overview2/index', '1', '0', 'M', '1', '1', 'dashboard:overview2:index', 'icon-paixu', 'supervisor', 1705550000000, NULL, 0, NULL); +-- INSERT INTO `sys_menu` VALUES (2076, 'Alarm Overview', 2129, 6, 'alarm-overview', 'faultManage/alarm-overview/index', '1', '1', 'M', '1', '1', 'faultManage:active-overview:index', 'icon-wenjian', 'supervisor', 1724144595914, '', 0, ''); INSERT INTO `sys_menu` VALUES (2077, 'Log Backup', 67, 102, 'logBackup', 'tool/files/logBackup/index', '1', '1', 'M', '1', '1', 'tool:files:logBackup:index', 'icon-tubiaoku', 'supervisor', 1724144595914, '', 0, ''); INSERT INTO `sys_menu` VALUES (2078, 'CDR Backup', 67, 100, 'cdrBackup', 'tool/files/cdrBackup/index', '1', '1', 'M', '1', '1', 'tool:files:cdrBackup:index', 'icon-tubiaoku', 'supervisor', 1724144595914, '', 0, ''); INSERT INTO `sys_menu` VALUES (2079, 'IMS KPI Dashboard', 2099, 8, 'dashboard', 'perfManage/overview/index', '1', '0', 'M', '1', '1', 'perfManage:dashboard:index', 'icon-fuzhichenggong', 'supervisor', 1728642924734, 'supervisor', 1728642924734, ''); @@ -255,7 +255,7 @@ INSERT INTO `sys_menu` VALUES (10018, 'menu.tenant.log', 0, 103, 'operate', 'ten INSERT INTO `sys_menu` VALUES (10019, 'menu.tenant.cdr', 0, 96, 'mtCDR', NULL, '1', '1', 'D', '1', '1', NULL, 'icon-tubiaohuizhi', 'supervisor', 1700000000000, NULL, 0, 'CDR'); INSERT INTO `sys_menu` VALUES (10020, 'menu.tenant.onlineIMS', 10022, 93, 'ims', 'tenant/ims/index', '1', '0', 'M', '1', '1', 'tenant:ims:index', 'icon-wocanyu', 'supervisor', 1718697278784, '', 0, ''); INSERT INTO `sys_menu` VALUES (10021, 'menu.tenant.smscCDR', 10019, 99, 'smscCDR', 'tenant/smscCDR/index', '1', '0', 'M', '1', '1', 'tenant:smfCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); -INSERT INTO `sys_menu` VALUES (10022, 'menu.tenant.session', 0, 92, 'session', NULL, '1', '0', 'D', '1', '1', NULL, 'icon-wocanyu', 'supervisor', 1716454666743, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10022, 'menu.tenant.session', 0, 92, 'session', NULL, '1', '0', 'D', '1', '1', 'tenant:session:index', 'icon-wocanyu', 'supervisor', 1716454666743, '', 0, ''); -- end for tenant user diff --git a/database/upgrade/upg_sys_config.sql b/database/upgrade/upg_sys_config.sql index 5e77b299..c1111756 100644 --- a/database/upgrade/upg_sys_config.sql +++ b/database/upgrade/upg_sys_config.sql @@ -33,7 +33,7 @@ INSERT IGNORE INTO `sys_config` VALUES (104, 'config.sys.logo.filePathBrand', 's INSERT IGNORE INTO `sys_config` VALUES (105, 'config.sys.loginBackground', 'sys.loginBackground', '#', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.loginBackgroundRemark'); INSERT IGNORE INTO `sys_config` VALUES (106, 'config.sys.title', 'sys.title', 'config.sys.titleValue', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.titleRemark'); INSERT IGNORE INTO `sys_config` VALUES (107, 'config.sys.copyright', 'sys.copyright', 'config.sys.copyrightValue', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.copyrightRemark'); -INSERT IGNORE INTO `sys_config` VALUES (108, 'config.sys.i18nOpen', 'sys.i18n.open', 'true', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.i18nOpenRemark'); +INSERT IGNORE INTO `sys_config` VALUES (108, 'config.sys.i18nOpen', 'sys.i18n.open', 'false', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.i18nOpenRemark'); INSERT IGNORE INTO `sys_config` VALUES (109, 'config.sys.i18nDefault', 'sys.i18n.default', 'en_US', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.i18nDefaultRemark'); INSERT IGNORE INTO `sys_config` VALUES (110, 'config.sys.lockTime', 'sys.lockTime', '0', 'Y', 'supervisor', 1704960008300, 'admin', 1706838764703, 'config.sys.lockTimeRemark'); INSERT IGNORE INTO `sys_config` VALUES (111, 'config.sys.homePage', 'sys.homePage', 'dashboard/overview/index', 'Y', 'supervisor', 1704960008300, 'admin', 1706838764703, 'config.sys.homePageRemark'); diff --git a/database/upgrade/upg_sys_menu.sql b/database/upgrade/upg_sys_menu.sql index 3a381957..ee619d5f 100644 --- a/database/upgrade/upg_sys_menu.sql +++ b/database/upgrade/upg_sys_menu.sql @@ -122,8 +122,8 @@ REPLACE INTO `sys_menu` VALUES (2011, 'menu.ueUser.voipUDM', 5, 3, 'voip', 'neUs REPLACE INTO `sys_menu` VALUES (2012, 'menu.ueUser.imsUDM', 5, 4, 'imsUDM', 'neUser/imsUDM/index', '1', '1', 'M', '1', '1', 'neUser:imsUDM:index', 'icon-xiangmuchengyuan', 'supervisor', 1700000000000, NULL, 0, 'menu.ueUser.imsUDMRemark'); REPLACE INTO `sys_menu` VALUES (2013, 'menu.log', 2089, 27, 'logsD', '', '1', '0', 'D', '1', '1', '', 'icon-wenjian', 'supervisor', 1700000000000, 'supervisor', 1715413568692, ''); REPLACE INTO `sys_menu` VALUES (2074, 'KPI Indicator Management', 2099, 22, 'kpi-title', 'perfManage/kpi-title/index', '1', '1', 'M', '1', '1', 'perfManage:kpi-title:index', 'icon-soutubiao', 'supervisor', 1700000000000, NULL, 0, ''); -REPLACE INTO `sys_menu` VALUES (2075, 'Dashboard2', 2087, 9, 'dashboard2', 'dashboard/overview2/index', '1', '0', 'M', '1', '1', 'dashboard:overview2:index', 'icon-paixu', 'supervisor', 1705550000000, NULL, 0, NULL); -REPLACE INTO `sys_menu` VALUES (2076, 'Alarm Overview', 2129, 6, 'alarm-overview', 'faultManage/alarm-overview/index', '1', '1', 'M', '1', '1', 'faultManage:active-overview:index', 'icon-wenjian', 'supervisor', 1724144595914, '', 0, ''); +-- REPLACE INTO `sys_menu` VALUES (2075, 'Dashboard2', 2087, 9, 'dashboard2', 'dashboard/overview2/index', '1', '0', 'M', '1', '1', 'dashboard:overview2:index', 'icon-paixu', 'supervisor', 1705550000000, NULL, 0, NULL); +-- REPLACE INTO `sys_menu` VALUES (2076, 'Alarm Overview', 2129, 6, 'alarm-overview', 'faultManage/alarm-overview/index', '1', '1', 'M', '1', '1', 'faultManage:active-overview:index', 'icon-wenjian', 'supervisor', 1724144595914, '', 0, ''); REPLACE INTO `sys_menu` VALUES (2077, 'Log Backup', 67, 102, 'logBackup', 'tool/files/logBackup/index', '1', '1', 'M', '1', '1', 'tool:files:logBackup:index', 'icon-tubiaoku', 'supervisor', 1724144595914, '', 0, ''); REPLACE INTO `sys_menu` VALUES (2078, 'CDR Backup', 67, 100, 'cdrBackup', 'tool/files/cdrBackup/index', '1', '1', 'M', '1', '1', 'tool:files:cdrBackup:index', 'icon-tubiaoku', 'supervisor', 1724144595914, '', 0, ''); REPLACE INTO `sys_menu` VALUES (2079, 'IMS KPI Dashboard', 2099, 8, 'dashboard', 'perfManage/overview/index', '1', '0', 'M', '1', '1', 'perfManage:dashboard:index', 'icon-fuzhichenggong', 'supervisor', 1728642924734, 'supervisor', 1728642924734, ''); @@ -239,7 +239,7 @@ REPLACE INTO `sys_menu` VALUES (10018, 'menu.tenant.log', 0, 103, 'operate', 'te REPLACE INTO `sys_menu` VALUES (10019, 'menu.tenant.cdr', 0, 96, 'mtCDR', NULL, '1', '1', 'D', '1', '1', NULL, 'icon-tubiaohuizhi', 'supervisor', 1700000000000, NULL, 0, 'CDR'); REPLACE INTO `sys_menu` VALUES (10020, 'menu.tenant.onlineIMS', 10022, 93, 'ims', 'tenant/ims/index', '1', '0', 'M', '1', '1', 'tenant:ims:index', 'icon-wocanyu', 'supervisor', 1718697278784, '', 0, ''); REPLACE INTO `sys_menu` VALUES (10021, 'menu.tenant.smscCDR', 10019, 99, 'smscCDR', 'tenant/smscCDR/index', '1', '0', 'M', '1', '1', 'tenant:smfCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); -REPLACE INTO `sys_menu` VALUES (10022, 'menu.tenant.session', 0, 92, 'session', NULL, '1', '0', 'D', '1', '1', NULL, 'icon-wocanyu', 'supervisor', 1716454666743, '', 0, ''); +REPLACE INTO `sys_menu` VALUES (10022, 'menu.tenant.session', 0, 92, 'session', NULL, '1', '0', 'D', '1', '1', 'tenant:session:index', 'icon-wocanyu', 'supervisor', 1716454666743, '', 0, ''); -- end for tenant user diff --git a/src/modules/common/service/account.go b/src/modules/common/service/account.go index 5f9f499b..6a379d1b 100644 --- a/src/modules/common/service/account.go +++ b/src/modules/common/service/account.go @@ -189,7 +189,14 @@ func (s *Account) RouteMenus(userId string, isAdmin bool) []vo.Router { var buildMenus []vo.Router if isAdmin { menus := s.sysMenuService.SelectMenuTreeByUserId("*") - buildMenus = s.sysMenuService.BuildRouteMenus(menus, "") + // 超级管理员需要排除租户相关的菜单 + var menus2 []systemModel.SysMenu + for _, v := range menus { + if parse.Number(v.MenuID) < 10007 { + menus2 = append(menus2, v) + } + } + buildMenus = s.sysMenuService.BuildRouteMenus(menus2, "") } else { menus := s.sysMenuService.SelectMenuTreeByUserId(userId) buildMenus = s.sysMenuService.BuildRouteMenus(menus, "")