From 5e4d83d5994e2d962b4b9bd83803b0d3fe7311ca Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Sat, 31 Aug 2024 15:18:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../etc/db/{install => common}/z_nms_cxy.sql | 0 .../local/omc/etc/db/upgrade/z_nms_cxy.sql | 43 ------------------- omc/etc/omc.yaml | 6 +-- 3 files changed, 3 insertions(+), 46 deletions(-) rename build/system/usr/local/omc/etc/db/{install => common}/z_nms_cxy.sql (100%) delete mode 100644 build/system/usr/local/omc/etc/db/upgrade/z_nms_cxy.sql diff --git a/build/system/usr/local/omc/etc/db/install/z_nms_cxy.sql b/build/system/usr/local/omc/etc/db/common/z_nms_cxy.sql similarity index 100% rename from build/system/usr/local/omc/etc/db/install/z_nms_cxy.sql rename to build/system/usr/local/omc/etc/db/common/z_nms_cxy.sql diff --git a/build/system/usr/local/omc/etc/db/upgrade/z_nms_cxy.sql b/build/system/usr/local/omc/etc/db/upgrade/z_nms_cxy.sql deleted file mode 100644 index a55cebf..0000000 --- a/build/system/usr/local/omc/etc/db/upgrade/z_nms_cxy.sql +++ /dev/null @@ -1,43 +0,0 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; --- ---------------------------- --- 创建表 --- ---------------------------- -DROP TABLE IF EXISTS `nms_cxy_nrm_log`; -CREATE TABLE `nms_cxy_nrm_log` ( - `msg_id` bigint NOT NULL AUTO_INCREMENT COMMENT '消息序号，9位长度，递增', - `ruid` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '网络资源对象Ruid', - `user_label` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '用户标签-网元名称', - `change_time` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '资源变化时间，格式为"2022-12-15 08:34:24"', - `change_type` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '变化类型 add：新增 mod：修改 del：删除', - `change_oper` varchar(3000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '资源的具体属性', - `create_by` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建者', - `create_time` bigint DEFAULT NULL COMMENT '创建时间', - PRIMARY KEY (`msg_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='星网-资源数据操作日志'; - --- ---------------------------- --- 新增记录 --- ---------------------------- --- 性能数据文件的上报 -INSERT IGNORE INTO `sys_job` VALUES (null,'job.nms_cxy.performance_upload_oss', 'SYSTEM', 'performance_upload_oss', '{\"interval\":15,\"neTypes\":[\"AMF\",\"UPF\",\"UDM\",\"SMF\",\"NSSF\"]}', '0 0/15 * * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710819124454, 'job.nms_cxy.performance_upload_oss_remark'); -INSERT IGNORE INTO `sys_dict_data` VALUES (210, 210, 'job.nms_cxy.performance_upload_oss', '性能数据文件的上报', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -INSERT IGNORE INTO `sys_dict_data` VALUES (211, 211, 'job.nms_cxy.performance_upload_oss_remark', 'interval周期为15分钟。neTypes为数组对应上报数据的网元类型。', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -INSERT IGNORE INTO `sys_dict_data` VALUES (212, 212, 'job.nms_cxy.performance_upload_oss', 'Reporting of performance data files', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -INSERT IGNORE INTO `sys_dict_data` VALUES (213, 213, 'job.nms_cxy.performance_upload_oss_remark', 'The interval period is 15 minutes. neTypes is an array corresponding to the type of network element for which the data was reported.', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); - --- 资源数据上报接口 -INSERT IGNORE INTO `sys_job` VALUES (null,'job.nms_cxy.resource_upload_oss', 'SYSTEM', 'resource_upload_oss', '{\"neTypes\":[\"AMF\",\"UPF\"]}', '0 0 0,12 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710819133986, 'job.nms_cxy.resource_upload_oss_remark'); -INSERT IGNORE INTO `sys_dict_data` VALUES (215, 215, 'job.nms_cxy.resource_upload_oss', '资源数据上报接口', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -INSERT IGNORE INTO `sys_dict_data` VALUES (216, 216, 'job.nms_cxy.resource_upload_oss_remark', '每天的 0 时及 12 时上报网元的全量资源数据文件至 OSS。', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -INSERT IGNORE INTO `sys_dict_data` VALUES (217, 217, 'job.nms_cxy.resource_upload_oss', 'Resource data reporting interface', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -INSERT IGNORE INTO `sys_dict_data` VALUES (218, 218, 'job.nms_cxy.resource_upload_oss_remark', 'Full resource data files for network elements are reported to the OSS at 0000 and 1200 hours each day.', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); - --- 配置数据上报接口 -INSERT IGNORE INTO `sys_job` VALUES (null,'job.nms_cxy.config_upload_oss', 'SYSTEM', 'config_upload_oss', '{\"neTypes\":[\"AMF\",\"UPF\",\"UDM\",\"SMF\"]}', '0 0 0,12 * * ?', '3', '0', '1', '1', 'supervisor', 1698478134839, 'supervisor', 1710818082110, 'job.nms_cxy.config_upload_oss_remark'); -INSERT IGNORE INTO `sys_dict_data` VALUES (220, 220, 'job.nms_cxy.config_upload_oss', '配置数据上报接口', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -INSERT IGNORE INTO `sys_dict_data` VALUES (221, 221, 'job.nms_cxy.config_upload_oss_remark', '配置数据上报时间为每日的0时及12时。', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -INSERT IGNORE INTO `sys_dict_data` VALUES (222, 222, 'job.nms_cxy.config_upload_oss', 'Configure data reporting interface', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -INSERT IGNORE INTO `sys_dict_data` VALUES (223, 223, 'job.nms_cxy.config_upload_oss_remark', 'Set the data reporting time to 0:00 and 12:00 every day.', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); - -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/omc/etc/omc.yaml b/omc/etc/omc.yaml index 4f60ff9..f48a0db 100644 --- a/omc/etc/omc.yaml +++ b/omc/etc/omc.yaml @@ -23,7 +23,7 @@ rest: port: 33040 webServer: - enabled: true + enabled: false rootDir: d:/local.git/fe.ems.vue3/dist listen: - addr: :80 @@ -39,8 +39,8 @@ database: type: mysql user: root password: "1000omc@kp!" - host: "192.168.8.58" - port: 33066 + host: "192.168.9.58" + port: 13306 name: "omc_db_nms_cxy" connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True backup: d:/local.git/be.ems/restagent/database