OMC/be.ems
3
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into lichang

Browse Source
This commit is contained in:
TsMask committed 2024-04-15 15:58:44 +08:00
2 parents 12feeeaa64 8b01661392
commit f3dc06d0d9
16 files changed
+41 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

captrace/makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# Makefile for rest agent project # Makefile for rest agent project
PROJECT = OMC PROJECT = OMC
VERSION = 2.2404.3 VERSION = 2.2404.4
PLATFORM = amd64 PLATFORM = amd64
ARMPLATFORM = aarch64 ARMPLATFORM = aarch64
BUILDDIR = ../../build BUILDDIR = ../../build
crontask/makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# Makefile for OMC-OMC-crontask project # Makefile for OMC-OMC-crontask project
PROJECT = OMC PROJECT = OMC
VERSION = 2.2404.3 VERSION = 2.2404.4
LIBDIR = be.ems/lib LIBDIR = be.ems/lib
BINNAME = crontask BINNAME = crontask
data2html/makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# Makefile for rest agent project # Makefile for rest agent project
PROJECT = OMC PROJECT = OMC
VERSION = 2.2404.3 VERSION = 2.2404.4
RelDate = `date +%Y%m%d` RelDate = `date +%Y%m%d`
Release = $(RelDate) Release = $(RelDate)
RelVer = $(VERSION)-$(RelDate) RelVer = $(VERSION)-$(RelDate)
database/install/sys_dict_data.sql
+3 -3
View File
@@ -37,7 +37,7 @@ CREATE TABLE `sys_dict_data` (
`update_time` bigint(20) DEFAULT 0 COMMENT '更新时间', `update_time` bigint(20) DEFAULT 0 COMMENT '更新时间',
`remark` varchar(500) DEFAULT NULL COMMENT '备注', `remark` varchar(500) DEFAULT NULL COMMENT '备注',
PRIMARY KEY (`dict_code`) USING BTREE PRIMARY KEY (`dict_code`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=4116 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='字典数据表'; ) ENGINE=InnoDB AUTO_INCREMENT=4130 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='字典数据表';
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@@ -46,7 +46,7 @@ CREATE TABLE `sys_dict_data` (
LOCK TABLES `sys_dict_data` WRITE; LOCK TABLES `sys_dict_data` WRITE;
/*!40000 ALTER TABLE `sys_dict_data` DISABLE KEYS */; /*!40000 ALTER TABLE `sys_dict_data` DISABLE KEYS */;
INSERT INTO `sys_dict_data` VALUES (1,1,'dictData.sex.un','0','sys_user_sex',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(2,2,'dictData.sex.male','1','sys_user_sex',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(3,3,'dictData.sex.female','2','sys_user_sex',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(4,1,'dictData.show','1','sys_show_hide',NULL,'success','1','supervisor',1699350000000,NULL,0,NULL),(5,2,'dictData.hide','0','sys_show_hide',NULL,'error','1','supervisor',1699350000000,NULL,0,NULL),(6,1,'dictData.normal','1','sys_normal_disable',NULL,'success','1','supervisor',1699350000000,NULL,0,NULL),(7,2,'dictData.disable','0','sys_normal_disable',NULL,'error','1','supervisor',1699350000000,NULL,0,NULL),(8,1,'dictData.yes','Y','sys_yes_no',NULL,'success','1','supervisor',1699350000000,NULL,0,NULL),(9,2,'dictData.no','N','sys_yes_no',NULL,'error','1','supervisor',1699350000000,NULL,0,NULL),(10,1,'dictData.success','1','sys_common_status',NULL,'success','1','supervisor',1699350000000,NULL,0,NULL),(11,2,'dictData.fail','0','sys_common_status',NULL,'error','1','supervisor',1699350000000,NULL,0,NULL),(12,1,'dictData.jobStatus.normal','1','sys_job_status',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(13,2,'dictData.jobStatus.pause','0','sys_job_status',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(14,1,'dictData.jobGroup.Default','DEFAULT','sys_job_group',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(15,2,'dictData.jobGroup.System','SYSTEM','sys_job_group',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(16,1,'dictData.operType.other','0','sys_oper_type',NULL,'processing','1','supervisor',1699350000000,NULL,0,NULL),(17,2,'dictData.operType.add','1','sys_oper_type',NULL,'processing','1','supervisor',1699350000000,NULL,0,NULL),(18,3,'dictData.operType.edit','2','sys_oper_type',NULL,'processing','1','supervisor',1699350000000,NULL,0,NULL),(19,4,'dictData.operType.delete','3','sys_oper_type',NULL,'error','1','supervisor',1699350000000,NULL,0,NULL),(20,5,'dictData.operType.auth','4','sys_oper_type',NULL,'success','1','supervisor',1699350000000,NULL,0,NULL),(21,6,'dictData.operType.export','5','sys_oper_type',NULL,'warning','1','supervisor',1699350000000,NULL,0,NULL),(22,7,'dictData.operType.import','6','sys_oper_type',NULL,'warning','1','supervisor',1699350000000,NULL,0,NULL),(23,8,'dictData.operType.forced quit','7','sys_oper_type',NULL,'error','1','supervisor',1699350000000,NULL,0,NULL),(24,9,'dictData.operType.clear','8','sys_oper_type',NULL,'error','1','supervisor',1699350000000,NULL,0,NULL),(25,1,'dictData.trace.interface','Interface','trace_type',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(26,2,'dictData.trace.device','Device','trace_type',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(27,3,'dictData.trace.user','UE','trace_type',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(28,1,'dictData.logType.download','DOWNLOAD','operation_log_type',NULL,'pink','1','supervisor',1699350000000,NULL,0,NULL),(29,2,'dictData.logType.activation','Activation','operation_log_type',NULL,'blue ','1','supervisor',1699350000000,NULL,0,NULL),(30,3,'dictData.logType.add','ADD','operation_log_type',NULL,'cyan','1','supervisor',1699350000000,NULL,0,NULL),(31,4,'dictData.logType.other','AUTO','operation_log_type',NULL,'gold','1','supervisor',1699350000000,NULL,0,NULL),(32,5,'dictData.logType.back','BACK','operation_log_type',NULL,'blue ','1','supervisor',1699350000000,NULL,0,NULL),(33,6,'dictData.logType.delete','DELETE','operation_log_type',NULL,'red','1','supervisor',1699350000000,NULL,0,NULL),(34,7,'dictData.logType.distribute','Distribute','operation_log_type',NULL,'yellow','1','supervisor',1699350000000,NULL,0,NULL),(35,8,'dictData.logType.export','EXPORT','operation_log_type',NULL,'green','1','supervisor',1699350000000,NULL,0,NULL),(36,9,'dictData.logType.query','SELECT','operation_log_type',NULL,'gold','1','supervisor',1699350000000,NULL,0,NULL),(37,10,'dictData.logType.setup','SET','operation_log_type',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(38,11,'dictData.logType.update','UPDATE','operation_log_type',NULL,'magenta','1','supervisor',1699350000000,NULL,0,NULL),(39,12,'dictData.logType.upload','UPLOAD','operation_log_type',NULL,'yellow','1','supervisor',1699350000000,NULL,0,NULL),(40,13,'dictData.logType.view','View','operation_log_type',NULL,'purple','1','supervisor',1699350000000,NULL,0,NULL),(41,14,'dictData.logType.login','0','security_log_type',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(42,15,'dictData.logType.logout','1','security_log_type',NULL,'cyan','1','supervisor',1699350000000,NULL,0,NULL),(43,1,'dictData.securityLogType.add','2','security_log_type',NULL,'green','1','supervisor',1699350000000,NULL,0,NULL),(44,2,'dictData.securityLogType.update','3','security_log_type',NULL,'lime','1','supervisor',1699350000000,NULL,0,NULL),(45,3,'dictData.securityLogType.delete','4','security_log_type',NULL,NULL,'1','supervLine truncated INSERT INTO `sys_dict_data` VALUES (1,1,'dictData.sex.un','0','sys_user_sex',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(2,2,'dictData.sex.male','1','sys_user_sex',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(3,3,'dictData.sex.female','2','sys_user_sex',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(4,1,'dictData.show','1','sys_show_hide',NULL,'success','1','supervisor',1699350000000,NULL,0,NULL),(5,2,'dictData.hide','0','sys_show_hide',NULL,'error','1','supervisor',1699350000000,NULL,0,NULL),(6,1,'dictData.normal','1','sys_normal_disable',NULL,'success','1','supervisor',1699350000000,NULL,0,NULL),(7,2,'dictData.disable','0','sys_normal_disable',NULL,'error','1','supervisor',1699350000000,NULL,0,NULL),(8,1,'dictData.yes','Y','sys_yes_no',NULL,'success','1','supervisor',1699350000000,NULL,0,NULL),(9,2,'dictData.no','N','sys_yes_no',NULL,'error','1','supervisor',1699350000000,NULL,0,NULL),(10,1,'dictData.success','1','sys_common_status',NULL,'success','1','supervisor',1699350000000,NULL,0,NULL),(11,2,'dictData.fail','0','sys_common_status',NULL,'error','1','supervisor',1699350000000,NULL,0,NULL),(12,1,'dictData.jobStatus.normal','1','sys_job_status',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(13,2,'dictData.jobStatus.pause','0','sys_job_status',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(14,1,'dictData.jobGroup.Default','DEFAULT','sys_job_group',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(15,2,'dictData.jobGroup.System','SYSTEM','sys_job_group',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(16,1,'dictData.operType.other','0','sys_oper_type',NULL,'processing','1','supervisor',1699350000000,NULL,0,NULL),(17,2,'dictData.operType.add','1','sys_oper_type',NULL,'processing','1','supervisor',1699350000000,NULL,0,NULL),(18,3,'dictData.operType.edit','2','sys_oper_type',NULL,'processing','1','supervisor',1699350000000,NULL,0,NULL),(19,4,'dictData.operType.delete','3','sys_oper_type',NULL,'error','1','supervisor',1699350000000,NULL,0,NULL),(20,5,'dictData.operType.auth','4','sys_oper_type',NULL,'success','1','supervisor',1699350000000,NULL,0,NULL),(21,6,'dictData.operType.export','5','sys_oper_type',NULL,'warning','1','supervisor',1699350000000,NULL,0,NULL),(22,7,'dictData.operType.import','6','sys_oper_type',NULL,'warning','1','supervisor',1699350000000,NULL,0,NULL),(23,8,'dictData.operType.forced quit','7','sys_oper_type',NULL,'error','1','supervisor',1699350000000,NULL,0,NULL),(24,9,'dictData.operType.clear','8','sys_oper_type',NULL,'error','1','supervisor',1699350000000,NULL,0,NULL),(25,1,'dictData.trace.interface','Interface','trace_type',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(26,2,'dictData.trace.device','Device','trace_type',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(27,3,'dictData.trace.user','UE','trace_type',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(28,1,'dictData.logType.download','DOWNLOAD','operation_log_type',NULL,'pink','1','supervisor',1699350000000,NULL,0,NULL),(29,2,'dictData.logType.activation','Activation','operation_log_type',NULL,'blue ','1','supervisor',1699350000000,NULL,0,NULL),(30,3,'dictData.logType.add','ADD','operation_log_type',NULL,'cyan','1','supervisor',1699350000000,NULL,0,NULL),(31,4,'dictData.logType.other','AUTO','operation_log_type',NULL,'gold','1','supervisor',1699350000000,NULL,0,NULL),(32,5,'dictData.logType.back','BACK','operation_log_type',NULL,'blue ','1','supervisor',1699350000000,NULL,0,NULL),(33,6,'dictData.logType.delete','DELETE','operation_log_type',NULL,'red','1','supervisor',1699350000000,NULL,0,NULL),(34,7,'dictData.logType.distribute','Distribute','operation_log_type',NULL,'yellow','1','supervisor',1699350000000,NULL,0,NULL),(35,8,'dictData.logType.export','EXPORT','operation_log_type',NULL,'green','1','supervisor',1699350000000,NULL,0,NULL),(36,9,'dictData.logType.query','SELECT','operation_log_type',NULL,'gold','1','supervisor',1699350000000,NULL,0,NULL),(37,10,'dictData.logType.setup','SET','operation_log_type',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(38,11,'dictData.logType.update','UPDATE','operation_log_type',NULL,'magenta','1','supervisor',1699350000000,NULL,0,NULL),(39,12,'dictData.logType.upload','UPLOAD','operation_log_type',NULL,'yellow','1','supervisor',1699350000000,NULL,0,NULL),(40,13,'dictData.logType.view','View','operation_log_type',NULL,'purple','1','supervisor',1699350000000,NULL,0,NULL),(41,14,'dictData.logType.login','0','security_log_type',NULL,NULL,'1','supervisor',1699350000000,NULL,0,NULL),(42,15,'dictData.logType.logout','1','security_log_type',NULL,'cyan','1','supervisor',1699350000000,NULL,0,NULL),(43,1,'dictData.securityLogType.add','2','security_log_type',NULL,'green','1','supervisor',1699350000000,NULL,0,NULL),(44,2,'dictData.securityLogType.update','3','security_log_type',NULL,'lime','1','supervisor',1699350000000,NULL,0,NULL),(45,3,'dictData.securityLogType.delete','4','security_log_type',NULL,NULL,'1','supervLine truncated
/*!40000 ALTER TABLE `sys_dict_data` ENABLE KEYS */; /*!40000 ALTER TABLE `sys_dict_data` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -59,4 +59,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2024-04-12 21:19:20 -- Dump completed on 2024-03-06 17:27:01
database/install/sys_menu.sql
+3 -3
View File
@@ -42,7 +42,7 @@ CREATE TABLE `sys_menu` (
`update_time` bigint(20) DEFAULT 0 COMMENT '更新时间', `update_time` bigint(20) DEFAULT 0 COMMENT '更新时间',
`remark` varchar(500) DEFAULT '' COMMENT '备注', `remark` varchar(500) DEFAULT '' COMMENT '备注',
PRIMARY KEY (`menu_id`) USING BTREE PRIMARY KEY (`menu_id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=2142 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='菜单权限表'; ) ENGINE=InnoDB AUTO_INCREMENT=2144 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='菜单权限表';
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --
@@ -51,7 +51,7 @@ CREATE TABLE `sys_menu` (
LOCK TABLES `sys_menu` WRITE; LOCK TABLES `sys_menu` WRITE;
/*!40000 ALTER TABLE `sys_menu` DISABLE KEYS */; /*!40000 ALTER TABLE `sys_menu` DISABLE KEYS */;
INSERT INTO `sys_menu` VALUES (1,'menu.system',0,16,'system',NULL,'1','1','D','1','1',NULL,'icon-xiangmu','supervisor',1700000000000,NULL,0,'menu.systemRemark'),(2,'menu.monitor',0,2,'monitor',NULL,'1','1','D','0','0',NULL,'icon-wenjian','supervisor',1700000000000,NULL,0,'menu.monitorRemark'),(3,'menu.tools',0,15,'tool',NULL,'1','1','D','1','1',NULL,'icon-wenjian','supervisor',1700000000000,NULL,0,'menu.toolsRemark'),(4,'menu.config',0,3,'configManage',NULL,'1','0','D','1','1',NULL,'icon-huizhiguize','supervisor',1700000000000,NULL,0,'menu.configRemark'),(5,'menu.ueUser',0,7,'neUser',NULL,'1','0','D','1','1',NULL,'icon-wocanyu','supervisor',1700000000000,NULL,0,'menu.ueUserRemark'),(6,'故障管理',0,50,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',1690000000000,'故障管理'),(7,'配置管理',0,550,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',0,'配置管理'),(8,'性能管理',0,551,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',0,'性能管理'),(9,'操作维护',0,552,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',0,'操作维护'),(10,'跟踪管理',0,553,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',1690000000000,'跟踪管理'),(11,'日志管理',0,554,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',0,'日志管理'),(12,'安全管理',0,555,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',0,'安全管理'),(13,'北向管理',0,556,'page',NULL,'1','0','D','0','0','page','fa fa-home','admin',1690000000000,'admin',1690000000000,'北向管理'),(14,'系统管理',0,557,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',0,'系统管理'),(15,'拓扑管理',0,558,'page',NULL,'1','0','D','0','0','page','fa fa-home','admin',1690000000000,'admin',0,'拓扑管理'),(100,'menu.security.user',2113,1,'user','system/user/index','1','1','M','1','1','system:user:list','icon-wocanyu','supervisor',1700000000000,NULL,0,'menu.security.userRemark'),(101,'menu.security.role',2113,3,'role','system/role/index','1','1','M','1','1','system:role:list','icon-anzhuo','supervisor',1700000000000,NULL,0,'menu.security.roleRemark'),(102,'menu.security.roleUser',2113,3,'role/inline/auth-user/:roleId','system/role/auth-user','1','1','M','0','1','system:role:auth','#','supervisor',1700000000000,NULL,0,'menu.security.roleUserRemark'),(103,'menu.system.menu',1,4,'menu','system/menu/index','1','1','M','1','1','system:menu:list','icon-wofaqi','supervisor',1700000000000,NULL,0,'menu.system.menuRemark'),(104,'menu.security.dept',2113,5,'dept','system/dept/index','1','1','M','1','1','system:dept:list','icon-yuzhanghao1','supervisor',1700000000000,NULL,0,'menu.security.deptRemark'),(105,'menu.security.post',2113,6,'post','system/post/index','1','1','M','1','1','system:post:list','icon-gonggaodayi','supervisor',1700000000000,NULL,0,'menu.security.postRemark'),(106,'menu.system.dictType',1,7,'dict','system/dict/index','1','1','M','1','1','system:dict:list','icon-tubiaoku','supervisor',1700000000000,NULL,0,'menu.system.dictTypeRemark'),(107,'menu.system.dictData',1,8,'dict/inline/data/:dictId','system/dict/data','1','1','M','0','1','system:dict:data','#','supervisor',1700000000000,NULL,0,'menu.system.dictDataRemark'),(108,'menu.system.paramSet',1,9,'config','system/config/index','1','1','M','1','1','system:config:list','icon-gongnengjieshao','supervisor',1700000000000,NULL,0,'menu.system.paramSetRemark'),(111,'menu.system.systemLog',1,11,'log',NULL,'1','1','D','0','0',NULL,'#','supervisor',1700000000000,NULL,0,'menu.system.systemLogRemark'),(112,'menu.system.systemInfo',1,3,'system-info','monitor/system/info','1','1','M','1','1','monitor:system:info','icon-fuzhidaima','supervisor',1700000000000,NULL,0,'menu.system.systemInfoRemark'),(113,'menu.system.cacheInfo',1,2,'cache-info','monitor/cache/info','1','1','M','1','1','monitor:cache:info','icon-gongnengjieshao','supervisor',1700000000000,NULL,0,'menu.system.cacheInfoRemark'),(114,'menu.system.cache',1,3,'cache','monitor/cache/index','1','1','M','1','1','monitor:cache:list','icon-tubiaoku','supervisor',1700000000000,NULL,0,'menu.system.cacheRemark'),(115,'menu.security.onlineUser',2113,2,'online','monitor/online/index','1','1','M','1','1','monitor:online:list','icon-xiangmuchengyuan','supervisor',1700000000000,NULL,0,'menu.security.onlineUserRemark'),(116,'menu.system.job',1,1,'job','monitor/job/index','1','1','M','1','1','monitor:job:list','icon-lishi','supervisor',1700000000000,NULL,0,'menu.system.jobRemark'),(117,'menu.system.jobLog',1,2,'/system/job/inline/log/:jobId','monitor/job/log','1','1','M','0','1','monitor:job:log','#','supervisor',1700000000000,NULL,0,'menu.system.jobLogRemark'),(118,'menu.tools.help',3,1,'help','tool/help/index','1','1','M','1','1','tool:help:list','#','supervisor',1700000000000,'supervisorLine truncated INSERT INTO `sys_menu` VALUES (1,'menu.system',0,16,'system',NULL,'1','1','D','1','1',NULL,'icon-xiangmu','supervisor',1700000000000,NULL,0,'menu.systemRemark'),(2,'menu.monitor',0,2,'monitor',NULL,'1','1','D','0','0',NULL,'icon-wenjian','supervisor',1700000000000,NULL,0,'menu.monitorRemark'),(3,'menu.tools',0,15,'tool',NULL,'1','1','D','1','1',NULL,'icon-wenjian','supervisor',1700000000000,NULL,0,'menu.toolsRemark'),(4,'menu.config',0,3,'configManage',NULL,'1','0','D','1','1',NULL,'icon-huizhiguize','supervisor',1700000000000,NULL,0,'menu.configRemark'),(5,'menu.ueUser',0,7,'neUser',NULL,'1','0','D','1','1',NULL,'icon-wocanyu','supervisor',1700000000000,NULL,0,'menu.ueUserRemark'),(6,'故障管理',0,50,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',1690000000000,'故障管理'),(7,'配置管理',0,550,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',0,'配置管理'),(8,'性能管理',0,551,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',0,'性能管理'),(9,'操作维护',0,552,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',0,'操作维护'),(10,'跟踪管理',0,553,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',1690000000000,'跟踪管理'),(11,'日志管理',0,554,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',0,'日志管理'),(12,'安全管理',0,555,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',0,'安全管理'),(13,'北向管理',0,556,'page',NULL,'1','0','D','0','0','page','fa fa-home','admin',1690000000000,'admin',1690000000000,'北向管理'),(14,'系统管理',0,557,'page',NULL,'1','0','D','0','1','page','fa fa-home','admin',1690000000000,'admin',0,'系统管理'),(15,'拓扑管理',0,558,'page',NULL,'1','0','D','0','0','page','fa fa-home','admin',1690000000000,'admin',0,'拓扑管理'),(100,'menu.security.user',2113,1,'user','system/user/index','1','1','M','1','1','system:user:list','icon-wocanyu','supervisor',1700000000000,NULL,0,'menu.security.userRemark'),(101,'menu.security.role',2113,3,'role','system/role/index','1','1','M','1','1','system:role:list','icon-anzhuo','supervisor',1700000000000,NULL,0,'menu.security.roleRemark'),(102,'menu.security.roleUser',2113,3,'role/inline/auth-user/:roleId','system/role/auth-user','1','1','M','0','1','system:role:auth','#','supervisor',1700000000000,NULL,0,'menu.security.roleUserRemark'),(103,'menu.system.menu',1,4,'menu','system/menu/index','1','1','M','1','1','system:menu:list','icon-wofaqi','supervisor',1700000000000,NULL,0,'menu.system.menuRemark'),(104,'menu.security.dept',2113,5,'dept','system/dept/index','1','1','M','1','1','system:dept:list','icon-yuzhanghao1','supervisor',1700000000000,NULL,0,'menu.security.deptRemark'),(105,'menu.security.post',2113,6,'post','system/post/index','1','1','M','1','1','system:post:list','icon-gonggaodayi','supervisor',1700000000000,NULL,0,'menu.security.postRemark'),(106,'menu.system.dictType',1,7,'dict','system/dict/index','1','1','M','1','1','system:dict:list','icon-tubiaoku','supervisor',1700000000000,NULL,0,'menu.system.dictTypeRemark'),(107,'menu.system.dictData',1,8,'dict/inline/data/:dictId','system/dict/data','1','1','M','0','1','system:dict:data','#','supervisor',1700000000000,NULL,0,'menu.system.dictDataRemark'),(108,'menu.system.paramSet',1,9,'config','system/config/index','1','1','M','1','1','system:config:list','icon-gongnengjieshao','supervisor',1700000000000,NULL,0,'menu.system.paramSetRemark'),(111,'menu.system.systemLog',1,11,'log',NULL,'1','1','D','0','0',NULL,'#','supervisor',1700000000000,NULL,0,'menu.system.systemLogRemark'),(112,'menu.system.systemInfo',1,3,'system-info','monitor/system/info','1','1','M','1','1','monitor:system:info','icon-fuzhidaima','supervisor',1700000000000,NULL,0,'menu.system.systemInfoRemark'),(113,'menu.system.cacheInfo',1,2,'cache-info','monitor/cache/info','1','1','M','1','1','monitor:cache:info','icon-gongnengjieshao','supervisor',1700000000000,NULL,0,'menu.system.cacheInfoRemark'),(114,'menu.system.cache',1,3,'cache','monitor/cache/index','1','1','M','1','1','monitor:cache:list','icon-tubiaoku','supervisor',1700000000000,NULL,0,'menu.system.cacheRemark'),(115,'menu.security.onlineUser',2113,2,'online','monitor/online/index','1','1','M','1','1','monitor:online:list','icon-xiangmuchengyuan','supervisor',1700000000000,NULL,0,'menu.security.onlineUserRemark'),(116,'menu.system.job',1,1,'job','monitor/job/index','1','1','M','1','1','monitor:job:list','icon-lishi','supervisor',1700000000000,NULL,0,'menu.system.jobRemark'),(117,'menu.system.jobLog',1,2,'/system/job/inline/log/:jobId','monitor/job/log','1','1','M','0','1','monitor:job:log','#','supervisor',1700000000000,NULL,0,'menu.system.jobLogRemark'),(118,'menu.tools.help',3,1,'help','tool/help/index','1','1','M','1','1','tool:help:list','#','supervisor',1700000000000,'supervisorLine truncated
/*!40000 ALTER TABLE `sys_menu` ENABLE KEYS */; /*!40000 ALTER TABLE `sys_menu` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -64,4 +64,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2024-04-12 21:19:20 -- Dump completed on 2024-04-12 21:58:05
makefile
+1 -1
View File
@@ -3,7 +3,7 @@
ProjectL = omc ProjectL = omc
ProjectU = OMC ProjectU = OMC
PROJECT = $(ProjectL) PROJECT = $(ProjectL)
VERSION = 2.2404.3 VERSION = 2.2404.4
RelDate = `date +%Y%m%d` RelDate = `date +%Y%m%d`
Release = $(RelDate) Release = $(RelDate)
RelVer = $(VERSION)-$(RelDate) RelVer = $(VERSION)-$(RelDate)
misc/actpkg.sh
+2
View File
@@ -27,6 +27,7 @@ case "${extension}" in
EOF EOF
if [ ${neType} == "OMC" ]; then if [ ${neType} == "OMC" ]; then
${omcBin}/setomc.sh -m upgrade >> ${logFile} ${omcBin}/setomc.sh -m upgrade >> ${logFile}
${omcBin}/omcsvc.sh restart
fi fi
;; ;;
rpm) rpm)
@@ -42,6 +43,7 @@ EOF
EOF EOF
if [ ${neType} == "OMC" ]; then if [ ${neType} == "OMC" ]; then
${omcBin}/setomc.sh -m upgrade >> ${logFile} ${omcBin}/setomc.sh -m upgrade >> ${logFile}
${omcBin}/omcsvc.sh restart
fi fi
;; ;;
*) *)
misc/rbkpkg.sh
+2
View File
@@ -27,6 +27,7 @@ case "${extension}" in
EOF EOF
if [ ${neType} == "OMC" ]; then if [ ${neType} == "OMC" ]; then
${omcBin}/setomc.sh -m upgrade >> ${logFile} ${omcBin}/setomc.sh -m upgrade >> ${logFile}
${omcBin}/omcsvc.sh restart
fi fi
;; ;;
rpm) rpm)
@@ -42,6 +43,7 @@ EOF
EOF EOF
if [ ${neType} == "OMC" ]; then if [ ${neType} == "OMC" ]; then
${omcBin}/setomc.sh -m upgrade >> ${logFile} ${omcBin}/setomc.sh -m upgrade >> ${logFile}
${omcBin}/omcsvc.sh restart
fi fi
;; ;;
*) *)
mkpkg.sh
+1 -1
View File
@@ -2,7 +2,7 @@
ProcList="restagent crontask sshsvc captrace data2html" ProcList="restagent crontask sshsvc captrace data2html"
ProjectL=omc ProjectL=omc
VERSION=2.2404.3 VERSION=2.2404.4
RelDate=`date +%Y%m%d` RelDate=`date +%Y%m%d`
Release=${RelDate} Release=${RelDate}
RelVer=${VERSION}-${RelDate} RelVer=${VERSION}-${RelDate}
restagent/makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# Makefile for rest agent project # Makefile for rest agent project
PROJECT = OMC PROJECT = OMC
VERSION = 2.2404.3 VERSION = 2.2404.4
PLATFORM = amd64 PLATFORM = amd64
ARMPLATFORM = aarch64 ARMPLATFORM = aarch64
BUILDDIR = ../../build BUILDDIR = ../../build
src/framework/config/config/config.default.yaml
+1 -1
View File
@@ -1,7 +1,7 @@
# 项目信息 # 项目信息
framework: framework:
name: "CN EMS" name: "CN EMS"
version: "2.2404.3" version: "2.2404.4"
# 应用服务配置 # 应用服务配置
server: server:
src/modules/monitor/controller/sys_job.go
+10 -5
View File
@@ -40,12 +40,17 @@ type SysJobController struct {
// //
// GET /list // GET /list
func (s *SysJobController) List(c *gin.Context) { func (s *SysJobController) List(c *gin.Context) {
querys := ctx.QueryMap(c)
data := s.sysJobService.SelectJobPage(querys)
rows := data["rows"].([]model.SysJob)
// 闭包函数处理多语言
language := ctx.AcceptLanguage(c) language := ctx.AcceptLanguage(c)
querys := ctx.QueryMap(c)
// 多语言值转key查询
if v, ok := querys["jobName"]; ok && v != "" {
querys["jobName"] = i18n.TFindKeyPrefix(language, "job", v.(string))
}
data := s.sysJobService.SelectJobPage(querys)
rows := data["rows"].([]model.SysJob)
// 闭包函数处理多语言
converI18n := func(language string, arr *[]model.SysJob) { converI18n := func(language string, arr *[]model.SysJob) {
for i := range *arr { for i := range *arr {
(*arr)[i].JobName = i18n.TKey(language, (*arr)[i].JobName) (*arr)[i].JobName = i18n.TKey(language, (*arr)[i].JobName)
src/modules/monitor/controller/sys_job_log.go
+7 -2
View File
@@ -39,6 +39,7 @@ type SysJobLogController struct {
// //
// GET /list // GET /list
func (s *SysJobLogController) List(c *gin.Context) { func (s *SysJobLogController) List(c *gin.Context) {
language := ctx.AcceptLanguage(c)
// 查询参数转换map // 查询参数转换map
querys := ctx.QueryMap(c) querys := ctx.QueryMap(c)
// 任务ID优先级更高 // 任务ID优先级更高
@@ -47,11 +48,15 @@ func (s *SysJobLogController) List(c *gin.Context) {
querys["jobName"] = jobInfo.JobName querys["jobName"] = jobInfo.JobName
querys["jobGroup"] = jobInfo.JobGroup querys["jobGroup"] = jobInfo.JobGroup
} }
data := s.sysJobLogService.SelectJobLogPage(querys) // 多语言值转key查询
if v, ok := querys["jobName"]; ok && v != "" {
querys["jobName"] = i18n.TFindKeyPrefix(language, "job", v.(string))
}
data := s.sysJobLogService.SelectJobLogPage(querys)
rows := data["rows"].([]model.SysJobLog) rows := data["rows"].([]model.SysJobLog)
// 闭包函数处理多语言 // 闭包函数处理多语言
language := ctx.AcceptLanguage(c)
converI18n := func(language string, arr *[]model.SysJobLog) { converI18n := func(language string, arr *[]model.SysJobLog) {
for i := range *arr { for i := range *arr {
(*arr)[i].JobName = i18n.TKey(language, (*arr)[i].JobName) (*arr)[i].JobName = i18n.TKey(language, (*arr)[i].JobName)
src/modules/system/controller/sys_dept.go
+4 -4
View File
@@ -35,13 +35,13 @@ func (s *SysDeptController) List(c *gin.Context) {
language := ctx.AcceptLanguage(c) language := ctx.AcceptLanguage(c)
var querys struct { var querys struct {
// 部门ID // 部门ID
DeptID string `json:"deptId"` DeptID string `form:"deptId"`
// 父部门ID // 父部门ID
ParentID string `json:"parentId" ` ParentID string `form:"parentId" `
// 部门名称 // 部门名称
DeptName string `json:"deptName" ` DeptName string `form:"deptName" `
// 部门状态（0正常 1停用） // 部门状态（0正常 1停用）
Status string `json:"status"` Status string `form:"status"`
} }
err := c.ShouldBindQuery(&querys) err := c.ShouldBindQuery(&querys)
if err != nil { if err != nil {
src/modules/system/controller/sys_menu.go
+2 -2
View File
@@ -33,9 +33,10 @@ type SysMenuController struct {
// //
// GET /list // GET /list
func (s *SysMenuController) List(c *gin.Context) { func (s *SysMenuController) List(c *gin.Context) {
language := ctx.AcceptLanguage(c)
query := model.SysMenu{} query := model.SysMenu{}
if v, ok := c.GetQuery("menuName"); ok && v != "" { if v, ok := c.GetQuery("menuName"); ok && v != "" {
query.MenuName = v query.MenuName = i18n.TFindKeyPrefix(language, "menu", v)
} }
if v, ok := c.GetQuery("status"); ok && v != "" { if v, ok := c.GetQuery("status"); ok && v != "" {
query.Status = v query.Status = v
@@ -48,7 +49,6 @@ func (s *SysMenuController) List(c *gin.Context) {
data := s.sysMenuService.SelectMenuList(query, userId) data := s.sysMenuService.SelectMenuList(query, userId)
// 闭包函数处理多语言 // 闭包函数处理多语言
language := ctx.AcceptLanguage(c)
var converI18n func(language string, arr *[]model.SysMenu) var converI18n func(language string, arr *[]model.SysMenu)
converI18n = func(language string, arr *[]model.SysMenu) { converI18n = func(language string, arr *[]model.SysMenu) {
for i := range *arr { for i := range *arr {
sshsvc/makefile
+1 -1
View File
@@ -1,7 +1,7 @@
# Makefile for OMC-OMC-crontask project # Makefile for OMC-OMC-crontask project
PROJECT = OMC PROJECT = OMC
VERSION = 2.2404.3 VERSION = 2.2404.4
LIBDIR = be.ems/lib LIBDIR = be.ems/lib
BINNAME = sshsvc BINNAME = sshsvc