From b0db83a0a9bc8190786735493c1cab9ef0e1f209 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Tue, 15 Oct 2024 14:45:41 +0800 Subject: [PATCH] fix: adjust menu for tenant --- database/install/sys_dict_data1_i18n_zh.sql | 1 + database/install/sys_dict_data2_i18n_en.sql | 1 + database/install/sys_menu.sql | 23 ++++++++++--------- .../upgrade/upg_sys_dict_data1_i18n_zh.sql | 1 + .../upgrade/upg_sys_dict_data2_i18n_en.sql | 1 + database/upgrade/upg_sys_menu.sql | 23 ++++++++++--------- 6 files changed, 28 insertions(+), 22 deletions(-) diff --git a/database/install/sys_dict_data1_i18n_zh.sql b/database/install/sys_dict_data1_i18n_zh.sql index 1a225822..70a9e104 100644 --- a/database/install/sys_dict_data1_i18n_zh.sql +++ b/database/install/sys_dict_data1_i18n_zh.sql @@ -737,5 +737,6 @@ INSERT INTO `sys_dict_data` VALUES (11038, 11000, 'tenant.errHasUserUse', '不 INSERT INTO `sys_dict_data` VALUES (11039, 11000, 'tenant.errAssetExists', '租赁资产[{type}:{key}]与现有的资产有冲突', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); INSERT INTO `sys_dict_data` VALUES (11040, 11000, 'menu.tenant.smscCDR', '短信话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); INSERT INTO `sys_dict_data` VALUES (11041, 11000, 'log.operate.export.tenantName', '租户名称', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (11042, 11000, 'menu.tenant.session', '会话', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/install/sys_dict_data2_i18n_en.sql b/database/install/sys_dict_data2_i18n_en.sql index e721210a..d5fce4f9 100644 --- a/database/install/sys_dict_data2_i18n_en.sql +++ b/database/install/sys_dict_data2_i18n_en.sql @@ -737,5 +737,6 @@ INSERT INTO `sys_dict_data` VALUES (14038, 14000, 'tenant.errHasUserUse', 'Delet INSERT INTO `sys_dict_data` VALUES (14039, 14000, 'tenant.errAssetExists', 'There is a conflict between tenancy asset[{type}:{key}] and a existing asset', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); INSERT INTO `sys_dict_data` VALUES (14040, 14000, 'menu.tenant.smscCDR', 'SMS CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); INSERT INTO `sys_dict_data` VALUES (14041, 14000, 'log.operate.export.tenantName', 'Tenant Name', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (14042, 14000, 'menu.tenant.session', 'Session', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/install/sys_menu.sql b/database/install/sys_menu.sql index c4fa8e89..039c4b32 100644 --- a/database/install/sys_menu.sql +++ b/database/install/sys_menu.sql @@ -217,17 +217,18 @@ INSERT INTO `sys_menu` VALUES (10007, 'menu.common.export', 10010, 6, '', '', '1 INSERT INTO `sys_menu` VALUES (10008, 'menu.common.checkexport', 10010, 7, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:checkExport', '#', 'supervisor', 1717492147021, '', 0, ''); INSERT INTO `sys_menu` VALUES (10009, 'menu.tenant.overview', 0, 90, 'overview', 'index/index', '1', '0', 'M', '0', '1', 'index:index', 'icon-paixu', 'admin', 1716445027021, 'supervisor', 1716453627718, 'Overview interface for tenants'); INSERT INTO `sys_menu` VALUES (10010, 'menu.tenant.subscriber', 0, 91, 'sub', 'tenant/sub/index', '1', '1', 'M', '1', '1', 'tenant:sub:index', 'icon-xiangmuchengyuan', 'supervisor', 1716446941420, 'supervisor', 1716453604732, 'UDM Subscriber Menu'); -INSERT INTO `sys_menu` VALUES (10011, 'menu.tenant.onlineUE', 0, 92, 'ue', 'tenant/ue/index', '1', '0', 'M', '1', '1', 'tenant:ue:index', 'icon-wocanyu', 'supervisor', 1718697278784, '', 0, ''); -INSERT INTO `sys_menu` VALUES (10012, 'menu.tenant.radio', 0, 93, 'base5G', 'tenant/base5G/index', '1', '0', 'M', '1', '1', 'tenant:base5G:index', 'icon-suofang', 'supervisor', 1718696648153, '', 0, ''); -INSERT INTO `sys_menu` VALUES (10013, 'menu.tenant.imsCDR', 0, 94, 'imsCDR', 'tenant/imsCDR/index', '1', '0', 'M', '1', '1', 'tenant:imsCDR:index', 'icon-tubiaohuizhi', 'supervisor', 1716454666743, '', 0, ''); -INSERT INTO `sys_menu` VALUES (10014, 'menu.tenant.smfCDR', 0, 95, 'smfCDR', 'tenant/smfCDR/index', '1', '0', 'M', '1', '1', 'tenant:smfCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); -INSERT INTO `sys_menu` VALUES (10015, 'menu.tenant.ueEvent', 0, 97, 'ueEvent', 'tenant/ueEvent/index', '1', '0', 'D', '0', '1', 'tenant:ueEvent:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); -INSERT INTO `sys_menu` VALUES (10016, 'menu.tenant.amfUE', 0, 97, 'amfUE', 'tenant/amfUE/index', '1', '0', 'M', '1', '1', 'tenant:amfUE:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); -INSERT INTO `sys_menu` VALUES (10017, 'menu.tenant.mmeUE', 0, 98, 'mmeUE', 'tenant/mmeUE/index', '1', '0', 'M', '1', '1', 'tenant:mmeUE:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); -INSERT INTO `sys_menu` VALUES (10018, 'menu.tenant.log', 0, 99, 'operate', 'tenant/operate/index', '1', '1', 'M', '1', '1', 'tenant:operate:list', 'icon-fuzhidaima', 'supervisor', 1716447063341, 'supervisor', 1716453612175, 'Operation log menu'); -INSERT INTO `sys_menu` VALUES (10019, 'menu.tenant.cdr', 0, 94, 'CDR', NULL, '1', '1', 'D', '0', '1', NULL, 'icon-tubiaohuizhi', 'supervisor', 1700000000000, NULL, 0, 'CDR'); -INSERT INTO `sys_menu` VALUES (10020, 'menu.tenant.onlineIMS', 0, 92, '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', 0, 96, 'smscCDR', 'tenant/smscCDR/index', '1', '0', 'M', '1', '1', 'tenant:smfCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10011, 'menu.tenant.onlineUE', 10022, 94, 'ue', 'tenant/ue/index', '1', '0', 'M', '1', '1', 'tenant:ue:index', 'icon-wocanyu', 'supervisor', 1718697278784, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10012, 'menu.tenant.radio', 0, 95, 'base5G', 'tenant/base5G/index', '1', '0', 'M', '1', '1', 'tenant:base5G:index', 'icon-suofang', 'supervisor', 1718696648153, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10013, 'menu.tenant.imsCDR', 10019, 97, 'imsCDR', 'tenant/imsCDR/index', '1', '0', 'M', '1', '1', 'tenant:imsCDR:index', 'icon-tubiaohuizhi', 'supervisor', 1716454666743, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10014, 'menu.tenant.smfCDR', 100190, 98, 'smfCDR', 'tenant/smfCDR/index', '1', '0', 'M', '1', '1', 'tenant:smfCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10015, 'menu.tenant.ueEvent', 0, 100, 'ueEvent', NULL, '1', '0', 'D', '1', '1', NULL, 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); +INSERT INTO `sys_menu` VALUES (10016, 'menu.tenant.amfUE', 10015, 101, 'amfUE', 'tenant/amfUE/index', '1', '0', 'M', '1', '1', 'tenant:amfUE:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); +INSERT INTO `sys_menu` VALUES (10017, 'menu.tenant.mmeUE', 10015, 102, 'mmeUE', 'tenant/mmeUE/index', '1', '0', 'M', '1', '1', 'tenant:mmeUE:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); +INSERT INTO `sys_menu` VALUES (10018, 'menu.tenant.log', 0, 103, 'operate', 'tenant/operate/index', '1', '1', 'M', '1', '1', 'tenant:operate:list', 'icon-fuzhidaima', 'supervisor', 1716447063341, 'supervisor', 1716453612175, 'Operation log menu'); +INSERT INTO `sys_menu` VALUES (10019, 'menu.tenant.cdr', 0, 96, 'CDR', 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, ''); -- end for tenant user diff --git a/database/upgrade/upg_sys_dict_data1_i18n_zh.sql b/database/upgrade/upg_sys_dict_data1_i18n_zh.sql index 0db20cf4..2ea4cedc 100644 --- a/database/upgrade/upg_sys_dict_data1_i18n_zh.sql +++ b/database/upgrade/upg_sys_dict_data1_i18n_zh.sql @@ -744,5 +744,6 @@ REPLACE INTO `sys_dict_data` VALUES (11038, 11000, 'tenant.errHasUserUse', '不 REPLACE INTO `sys_dict_data` VALUES (11039, 11000, 'tenant.errAssetExists', '租赁资产[{type}:{key}]与现有的资产有冲突', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); REPLACE INTO `sys_dict_data` VALUES (11040, 11000, 'menu.tenant.smscCDR', '短信话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); REPLACE INTO `sys_dict_data` VALUES (11041, 11000, 'log.operate.export.tenantName', '租户名称', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (11042, 11000, 'menu.tenant.session', '会话', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/upgrade/upg_sys_dict_data2_i18n_en.sql b/database/upgrade/upg_sys_dict_data2_i18n_en.sql index e3f2509d..70b4fb93 100644 --- a/database/upgrade/upg_sys_dict_data2_i18n_en.sql +++ b/database/upgrade/upg_sys_dict_data2_i18n_en.sql @@ -739,5 +739,6 @@ REPLACE INTO `sys_dict_data` VALUES (14038, 14000, 'tenant.errHasUserUse', 'Dele REPLACE INTO `sys_dict_data` VALUES (14039, 14000, 'tenant.errAssetExists', 'There is a conflict between tenancy asset[{type}:{key}] and a existing asset', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); REPLACE INTO `sys_dict_data` VALUES (14040, 14000, 'menu.tenant.smscCDR', 'SMS CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); REPLACE INTO `sys_dict_data` VALUES (14041, 14000, 'log.operate.export.tenantName', 'Tenant Name', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (14042, 14000, 'menu.tenant.session', 'Session', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/upgrade/upg_sys_menu.sql b/database/upgrade/upg_sys_menu.sql index 0211d5d5..220335fa 100644 --- a/database/upgrade/upg_sys_menu.sql +++ b/database/upgrade/upg_sys_menu.sql @@ -202,17 +202,18 @@ REPLACE INTO `sys_menu` VALUES (10007, 'menu.common.export', 10010, 6, '', '', ' REPLACE INTO `sys_menu` VALUES (10008, 'menu.common.checkexport', 10010, 7, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:checkExport', '#', 'supervisor', 1717492147021, '', 0, ''); REPLACE INTO `sys_menu` VALUES (10009, 'menu.tenant.overview', 0, 90, 'overview', 'index/index', '1', '0', 'M', '0', '1', 'index:index', 'icon-paixu', 'admin', 1716445027021, 'supervisor', 1716453627718, 'Overview interface for tenants'); REPLACE INTO `sys_menu` VALUES (10010, 'menu.tenant.subscriber', 0, 91, 'sub', 'tenant/sub/index', '1', '1', 'M', '1', '1', 'tenant:sub:index', 'icon-xiangmuchengyuan', 'supervisor', 1716446941420, 'supervisor', 1716453604732, 'UDM Subscriber Menu'); -REPLACE INTO `sys_menu` VALUES (10011, 'menu.tenant.onlineUE', 0, 92, 'ue', 'tenant/ue/index', '1', '0', 'M', '1', '1', 'tenant:ue:index', 'icon-wocanyu', 'supervisor', 1718697278784, '', 0, ''); -REPLACE INTO `sys_menu` VALUES (10012, 'menu.tenant.radio', 0, 93, 'base5G', 'tenant/base5G/index', '1', '0', 'M', '1', '1', 'tenant:base5G:index', 'icon-suofang', 'supervisor', 1718696648153, '', 0, ''); -REPLACE INTO `sys_menu` VALUES (10013, 'menu.tenant.imsCDR', 0, 94, 'imsCDR', 'tenant/imsCDR/index', '1', '0', 'M', '1', '1', 'tenant:imsCDR:index', 'icon-tubiaohuizhi', 'supervisor', 1716454666743, '', 0, ''); -REPLACE INTO `sys_menu` VALUES (10014, 'menu.tenant.smfCDR', 0, 95, 'smfCDR', 'tenant/smfCDR/index', '1', '0', 'M', '1', '1', 'tenant:smfCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); -REPLACE INTO `sys_menu` VALUES (10015, 'menu.tenant.ueEvent', 0, 96, 'ueEvent', 'tenant/ueEvent/index', '1', '0', 'M', '0', '1', 'tenant:ueEvent:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); -REPLACE INTO `sys_menu` VALUES (10016, 'menu.tenant.amfUE', 0, 96, 'amfUE', 'tenant/amfUE/index', '1', '0', 'M', '1', '1', 'tenant:amfUE:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); -REPLACE INTO `sys_menu` VALUES (10017, 'menu.tenant.mmeUE', 0, 97, 'mmeUE', 'tenant/mmeUE/index', '1', '0', 'M', '1', '1', 'tenant:mmeUE:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); -REPLACE INTO `sys_menu` VALUES (10018, 'menu.tenant.log', 0, 98, 'operate', 'tenant/operate/index', '1', '1', 'M', '1', '1', 'tenant:operate:list', 'icon-fuzhidaima', 'supervisor', 1716447063341, 'supervisor', 1716453612175, 'Operation log menu'); -REPLACE INTO `sys_menu` VALUES (10019, 'menu.tenant.cdr', 0, 93, 'CDR', NULL, '1', '1', 'D', '0', '1', NULL, 'icon-tubiaohuizhi', 'supervisor', 1700000000000, NULL, 0, 'CDR'); -REPLACE INTO `sys_menu` VALUES (10020, 'menu.tenant.onlineIMS', 0, 92, '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', 0, 96, 'smscCDR', 'tenant/smscCDR/index', '1', '0', 'M', '1', '1', 'tenant:smfCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); +REPLACE INTO `sys_menu` VALUES (10011, 'menu.tenant.onlineUE', 10022, 94, 'ue', 'tenant/ue/index', '1', '0', 'M', '1', '1', 'tenant:ue:index', 'icon-wocanyu', 'supervisor', 1718697278784, '', 0, ''); +REPLACE INTO `sys_menu` VALUES (10012, 'menu.tenant.radio', 0, 95, 'base5G', 'tenant/base5G/index', '1', '0', 'M', '1', '1', 'tenant:base5G:index', 'icon-suofang', 'supervisor', 1718696648153, '', 0, ''); +REPLACE INTO `sys_menu` VALUES (10013, 'menu.tenant.imsCDR', 10019, 97, 'imsCDR', 'tenant/imsCDR/index', '1', '0', 'M', '1', '1', 'tenant:imsCDR:index', 'icon-tubiaohuizhi', 'supervisor', 1716454666743, '', 0, ''); +REPLACE INTO `sys_menu` VALUES (10014, 'menu.tenant.smfCDR', 100190, 98, 'smfCDR', 'tenant/smfCDR/index', '1', '0', 'M', '1', '1', 'tenant:smfCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); +REPLACE INTO `sys_menu` VALUES (10015, 'menu.tenant.ueEvent', 0, 100, 'ueEvent', 'tenant/ueEvent/index', '1', '0', 'D', '1', '1', 'tenant:ueEvent:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); +REPLACE INTO `sys_menu` VALUES (10016, 'menu.tenant.amfUE', 10015, 101, 'amfUE', 'tenant/amfUE/index', '1', '0', 'M', '1', '1', 'tenant:amfUE:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); +REPLACE INTO `sys_menu` VALUES (10017, 'menu.tenant.mmeUE', 10015, 102, 'mmeUE', 'tenant/mmeUE/index', '1', '0', 'M', '1', '1', 'tenant:mmeUE:index', 'icon-xiangmu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); +REPLACE INTO `sys_menu` VALUES (10018, 'menu.tenant.log', 0, 103, 'operate', 'tenant/operate/index', '1', '1', 'M', '1', '1', 'tenant:operate:list', 'icon-fuzhidaima', 'supervisor', 1716447063341, 'supervisor', 1716453612175, 'Operation log menu'); +REPLACE INTO `sys_menu` VALUES (10019, 'menu.tenant.cdr', 0, 96, 'CDR', 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:smscCDR: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, ''); -- end for tenant user