Merge remote-tracking branch 'origin/main' into practical-training

2024-07-19 11:18:43 +08:00
parent 7e0013c1e6 5c2fe4533d
commit ed3c0da046
16 changed files with 72 additions and 31 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # 版本发布日志

+## 2.2407.3-20240716
+
+- 更新 参数配置AMF参数配置system
+- 更新 参数配置UPF参数属性dataForwarderCommon
+- 修复 移除omc脚本命令前的sudo
+
 ## 2.2407.2-20240712

 - 修复 网元版本安装MME写入host文件ip错误
--- a/captrace/makefile
+++ b/captrace/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project

 PROJECT = OMC
-VERSION = 2.2407.2
+VERSION = 2.2407.3
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
--- a/config/param/amf_param_config.yaml
+++ b/config/param/amf_param_config.yaml
@@ -94,6 +94,20 @@ amf:
        filter: "0~64"
        display: "NEF URI"
        comment: ""
+      - name: "imeiRestrictionEnabled"
+        type: "bool"
+        value: "0"
+        access: "read-write"
+        filter: '{"0":"false","1":"true"}'
+        display: "IMEI Restriction Enabled"
+        comment: ""
+      - name: "allowedImeiPrefix"
+        type: "string"
+        value: "869583045"
+        access: "read-write"
+        filter: "0~128"
+        display: "Allowed IMEI Prefix"
+        comment: ""
      - name: "dnnCorrectionEnabled"
        type: "bool"
        value: "0"
--- a/crontask/makefile
+++ b/crontask/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project

 PROJECT = OMC
-VERSION = 2.2407.2
+VERSION = 2.2407.3
 LIBDIR = be.ems/lib
 BINNAME = crontask

--- a/data2html/makefile
+++ b/data2html/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project

 PROJECT = OMC
-VERSION = 2.2407.2
+VERSION = 2.2407.3
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
--- a/database/common/mml_command.sql
+++ b/database/common/mml_command.sql
@@ -63,7 +63,7 @@ INSERT INTO `mml_command` VALUES (1614, 'OMC', 'pmTaskManagement', 'Performance
 INSERT INTO `mml_command` VALUES (1615, 'OMC', 'pmTaskManagement', 'Performance Measure Task Management', 'del', 'measuretask', 'Delete Performance Measure Task', '[{\"alias\":\"id\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Task ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"id\",\"optional\":\"false\",\"type\":\"string\"}]', 'Active');
 INSERT INTO `mml_command` VALUES (1616, 'OMC', 'pmTaskManagement', 'Performance Measure Task Management', 'act', 'measuretask', 'Active Performance Measure Task', '[{\"alias\":\"id\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Task ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"id\",\"optional\":\"false\",\"type\":\"string\"}]', 'Active');
 INSERT INTO `mml_command` VALUES (1617, 'OMC', 'pmTaskManagement', 'Performance Measure Task Management', 'dea', 'measuretask', 'Deactive Performance Measure Task', '[{\"alias\":\"id\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Task ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"id\",\"optional\":\"false\",\"type\":\"string\"}]', 'Active');
-INSERT INTO `mml_command` VALUES (1618, 'OMC', 'pmDataManagement', 'Performance Data Management', 'lst', 'measuredata', 'List Performance Data', '[{\"alias\":\"task_id\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Task ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"id\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"ne_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"netype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"kpi_id\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"kpiid\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"start_time\\u003e\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Measure period start time(\\u003e=)\",\"filter\":\"\",\"name\":\"starttime\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"start_time\\u003c\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Measure period start time(\\u003c=)\",\"filter\":\"\",\"name\":\"endtime\",\"optional\":\"true\",\"type\":\"string\"}]', 'Active');
+INSERT INTO `mml_command` VALUES (1618, 'OMC', 'pmDataManagement', 'Performance Data Management', 'lst', 'measuredata', 'List Performance Data', '[{\"alias\":\"task_id\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Task ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"id\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"ne_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"netype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"kpi_id\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"KPI ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"kpiid\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"start_time\\u003e\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Measure period start time(\\u003e=)\",\"filter\":\"\",\"name\":\"starttime\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"start_time\\u003c\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Measure period start time(\\u003c=)\",\"filter\":\"\",\"name\":\"endtime\",\"optional\":\"true\",\"type\":\"string\"}]', 'Active');
 INSERT INTO `mml_command` VALUES (1619, 'OMC', 'logManagement', 'Log Management', 'lst', 'systemlog', 'List System Log', '[{\"alias\":\"process_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Process type\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"processtype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"log_time\\u003e\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Log time more than\",\"filter\":\"\",\"name\":\"starttime\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"log_time\\u003c\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Log time less than\",\"filter\":\"\",\"name\":\"endtime\",\"optional\":\"true\",\"type\":\"string\"}]', 'Active');
 INSERT INTO `mml_command` VALUES (1620, 'OMC', 'logManagement', 'Log Management', 'lst', 'operationlog', 'List Operation Log', '[{\"alias\":\"account_name\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Account ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"accountid\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"log_time\\u003e\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Log time more than\",\"filter\":\"\",\"name\":\"starttime\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"log_time\\u003c\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Log Time Less Than\",\"filter\":\"\",\"name\":\"endtime\",\"optional\":\"true\",\"type\":\"string\"}]', 'Active');
 INSERT INTO `mml_command` VALUES (1621, 'OMC', 'logManagement', 'Log Management', 'lst', 'securitylog', 'List Security Log', '[{\"alias\":\"account_name\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Account ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"accountid\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"op_time\\u003e\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Log time more than\",\"filter\":\"\",\"name\":\"starttime\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"op_time\\u003c\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Log time less than\",\"filter\":\"\",\"name\":\"endtime\",\"optional\":\"true\",\"type\":\"string\"}]', 'Active');
--- a/database/common/param_config.sql
+++ b/database/common/param_config.sql
@@ -28,11 +28,14 @@ INSERT INTO `param_config` VALUES (1243, 'NSSF', '', 'general', 'General', '', '
 INSERT INTO `param_config` VALUES (1244, 'NSSF', '', 'sbi', 'SBI', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Scheme\",\"filter\":\"\",\"name\":\"scheme\",\"type\":\"string\",\"value\":\"http\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Register IPv4\",\"filter\":\"\",\"name\":\"registerIpv4\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Binding IPv4\",\"filter\":\"\",\"name\":\"bindingIpv4\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Register IPv6\",\"filter\":\"\",\"name\":\"registerIpv6\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Binding IPv6\",\"filter\":\"\",\"name\":\"bindingIpv6\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"IP Type\",\"filter\":\"\",\"name\":\"ipType\",\"type\":\"string\",\"value\":\"ipv4\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Port\",\"filter\":\"\",\"name\":\"port\",\"type\":\"int\",\"value\":\"8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Telnet IPv4\",\"filter\":\"\",\"name\":\"telnetIpv4\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Telnet IPv6\",\"filter\":\"\",\"name\":\"telnetIpv6\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Telnet Port\",\"filter\":\"\",\"name\":\"telnetPort\",\"type\":\"int\",\"value\":\"4100\"}]}');
 INSERT INTO `param_config` VALUES (1245, 'NSSF', '', 'supportedNetworkSliceList', 'Supported Network Slice List', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"1~32\",\"display\":\"Index\",\"filter\":\"1~32\",\"name\":\"index\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"MCC\",\"filter\":\"\",\"name\":\"mcc\",\"type\":\"string\",\"value\":\"001\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"MNC\",\"filter\":\"\",\"name\":\"mnc\",\"type\":\"string\",\"value\":\"01\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"TAC\",\"filter\":\"\",\"name\":\"tac\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Supported SST\",\"filter\":\"\",\"name\":\"supportedSst\",\"type\":\"int\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Supported SD\",\"filter\":\"\",\"name\":\"supportedSd\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Restricted SST\",\"filter\":\"\",\"name\":\"restrictedSst\",\"type\":\"int\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Restricted SD\",\"filter\":\"\",\"name\":\"restrictedSd\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NRF ID\",\"filter\":\"\",\"name\":\"nrfId\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NSI ID\",\"filter\":\"\",\"name\":\"nsiId\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Access Type\",\"filter\":\"\",\"name\":\"accessType\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"AMF Set ID\",\"filter\":\"\",\"name\":\"amfSetId\",\"type\":\"string\",\"value\":\"\"}]}');
 INSERT INTO `param_config` VALUES (1246, 'NSSF', '', 'plmnMappingList', 'PLMN Mapping List', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"1~32\",\"display\":\"Index\",\"filter\":\"1~32\",\"name\":\"index\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Operator Name\",\"filter\":\"\",\"name\":\"operatorName\",\"type\":\"string\",\"value\":\"\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"MCC\",\"filter\":\"\",\"name\":\"mcc\",\"type\":\"string\",\"value\":\"001\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"MNC\",\"filter\":\"\",\"name\":\"mnc\",\"type\":\"string\",\"value\":\"02\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Serving SNSSAI SST\",\"filter\":\"\",\"name\":\"servingSnssaiSst\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Serving SNSSAI SD\",\"filter\":\"\",\"name\":\"servingSnssaiSd\",\"type\":\"string\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Home SNSSAI SST\",\"filter\":\"\",\"name\":\"homeSnssaiSst\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Home SNSSAI SD\",\"filter\":\"\",\"name\":\"homeSnssaiSd\",\"type\":\"string\",\"value\":\"1\"}]}');
-INSERT INTO `param_config` VALUES (1473, 'AMF', '', 'system', 'System Config', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"AMF Name\",\"filter\":\"0~64\",\"name\":\"amfName\",\"type\":\"string\",\"value\":\"AMF\"},{\"access\":\"read-write\",\"comment\":\"0~255\",\"display\":\"Relative Capacity\",\"filter\":\"0~255\",\"name\":\"relativeCapacity\",\"type\":\"int\",\"value\":\"255\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SBI Scheme\",\"filter\":\"{\\\"0\\\":\\\"http\\\",\\\"1\\\":\\\"https\\\"}\",\"name\":\"sbiScheme\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SBI Server IP\",\"filter\":\"0~64\",\"name\":\"sbiServerIp\",\"type\":\"string\",\"value\":\"192.168.1.183\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"SBI Server Port\",\"filter\":\"0~65535\",\"name\":\"sbiServerPort\",\"type\":\"int\",\"value\":\"8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NRF Enabled\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"nrfEnabled\",\"type\":\"bool\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NRF URI\",\"filter\":\"0~64\",\"name\":\"nrfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.180:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"AUSF URI\",\"filter\":\"0~64\",\"name\":\"ausfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.130:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UDM URI\",\"filter\":\"0~64\",\"name\":\"udmUri\",\"type\":\"string\",\"value\":\"http://172.16.5.140:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SMF URI\",\"filter\":\"0~64\",\"name\":\"smfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.150:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PCF URI\",\"filter\":\"0~64\",\"name\":\"pcfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.160:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"LMF URI\",\"filter\":\"0~64\",\"name\":\"lmfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.200:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NEF URI\",\"filter\":\"0~64\",\"name\":\"nefUri\",\"type\":\"string\",\"value\":\"http://172.16.5.210:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"DNN Correction Enabled\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"dnnCorrectionEnabled\",\"type\":\"bool\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Default DNN\",\"filter\":\"0~64\",\"name\":\"defaultDnn\",\"type\":\"string\",\"value\":\"internet\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Integrity Algorithm\",\"filter\":\"{\\\"0\\\":\\\"NIA0\\\",\\\"1\\\":\\\"NIA1\\\",\\\"2\\\":\\\"NIA2\\\",\\\"3\\\":\\\"NIA3\\\"}\",\"name\":\"integrityAlgorithm\",\"type\":\"enum\",\"value\":\"2\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Ciphering Algorithm\",\"filter\":\"{\\\"0\\\":\\\"NEA0\\\",\\\"1\\\":\\\"NEA1\\\",\\\"2\\\":\\\"NEA2\\\",\\\"3\\\":\\\"NEA3\\\"}\",\"name\":\"cipheringAlgorithm\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3502\",\"filter\":\"1~65535\",\"name\":\"t3502\",\"type\":\"int\",\"value\":\"720\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3512\",\"filter\":\"1~65535\",\"name\":\"t3512\",\"type\":\"int\",\"value\":\"3600\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3513\",\"filter\":\"1~65535\",\"name\":\"t3513\",\"type\":\"int\",\"value\":\"2\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3522\",\"filter\":\"1~65535\",\"name\":\"t3522\",\"type\":\"int\",\"value\":\"6\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3550\",\"filter\":\"1~65535\",\"name\":\"t3550\",\"type\":\"int\",\"value\":\"6\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3555\",\"filter\":\"1~65535\",\"name\":\"t3555\",\"type\":\"int\",\"value\":\"6\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3560\",\"filter\":\"1~65535\",\"name\":\"t3560\",\"type\":\"int\",\"value\":\"6\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3565\",\"filter\":\"1~65535\",\"name\":\"t3565\",\"type\":\"int\",\"value\":\"6\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3570\",\"filter\":\"1~65535\",\"name\":\"t3570\",\"type\":\"int\",\"value\":\"6\"}]}');
+
+-- AMF 更新时间2024/07/16 15:00
+INSERT INTO `param_config` VALUES (1473, 'AMF', '', 'system', 'System Config', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"AMF Name\",\"filter\":\"0~64\",\"name\":\"amfName\",\"type\":\"string\",\"value\":\"AMF\"},{\"access\":\"read-write\",\"comment\":\"0~255\",\"display\":\"Relative Capacity\",\"filter\":\"0~255\",\"name\":\"relativeCapacity\",\"type\":\"int\",\"value\":\"255\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SBI Scheme\",\"filter\":\"{\\\"0\\\":\\\"http\\\",\\\"1\\\":\\\"https\\\"}\",\"name\":\"sbiScheme\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SBI Server IP\",\"filter\":\"0~64\",\"name\":\"sbiServerIp\",\"type\":\"string\",\"value\":\"192.168.1.183\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"SBI Server Port\",\"filter\":\"0~65535\",\"name\":\"sbiServerPort\",\"type\":\"int\",\"value\":\"8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NRF Enabled\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"nrfEnabled\",\"type\":\"bool\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NRF URI\",\"filter\":\"0~64\",\"name\":\"nrfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.180:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"AUSF URI\",\"filter\":\"0~64\",\"name\":\"ausfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.130:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"UDM URI\",\"filter\":\"0~64\",\"name\":\"udmUri\",\"type\":\"string\",\"value\":\"http://172.16.5.140:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SMF URI\",\"filter\":\"0~64\",\"name\":\"smfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.150:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PCF URI\",\"filter\":\"0~64\",\"name\":\"pcfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.160:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"LMF URI\",\"filter\":\"0~64\",\"name\":\"lmfUri\",\"type\":\"string\",\"value\":\"http://172.16.5.200:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NEF URI\",\"filter\":\"0~64\",\"name\":\"nefUri\",\"type\":\"string\",\"value\":\"http://172.16.5.210:8080\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"IMEI Restriction Enabled\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"imeiRestrictionEnabled\",\"type\":\"bool\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Allowed IMEI Prefix\",\"filter\":\"0~128\",\"name\":\"allowedImeiPrefix\",\"type\":\"string\",\"value\":\"869583045\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"DNN Correction Enabled\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"dnnCorrectionEnabled\",\"type\":\"bool\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Default DNN\",\"filter\":\"0~64\",\"name\":\"defaultDnn\",\"type\":\"string\",\"value\":\"internet\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Integrity Algorithm\",\"filter\":\"{\\\"0\\\":\\\"NIA0\\\",\\\"1\\\":\\\"NIA1\\\",\\\"2\\\":\\\"NIA2\\\",\\\"3\\\":\\\"NIA3\\\"}\",\"name\":\"integrityAlgorithm\",\"type\":\"enum\",\"value\":\"2\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"Ciphering Algorithm\",\"filter\":\"{\\\"0\\\":\\\"NEA0\\\",\\\"1\\\":\\\"NEA1\\\",\\\"2\\\":\\\"NEA2\\\",\\\"3\\\":\\\"NEA3\\\"}\",\"name\":\"cipheringAlgorithm\",\"type\":\"enum\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3502\",\"filter\":\"1~65535\",\"name\":\"t3502\",\"type\":\"int\",\"value\":\"720\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3512\",\"filter\":\"1~65535\",\"name\":\"t3512\",\"type\":\"int\",\"value\":\"3600\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3513\",\"filter\":\"1~65535\",\"name\":\"t3513\",\"type\":\"int\",\"value\":\"2\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3522\",\"filter\":\"1~65535\",\"name\":\"t3522\",\"type\":\"int\",\"value\":\"6\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3550\",\"filter\":\"1~65535\",\"name\":\"t3550\",\"type\":\"int\",\"value\":\"6\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3555\",\"filter\":\"1~65535\",\"name\":\"t3555\",\"type\":\"int\",\"value\":\"6\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3560\",\"filter\":\"1~65535\",\"name\":\"t3560\",\"type\":\"int\",\"value\":\"6\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3565\",\"filter\":\"1~65535\",\"name\":\"t3565\",\"type\":\"int\",\"value\":\"6\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"T3570\",\"filter\":\"1~65535\",\"name\":\"t3570\",\"type\":\"int\",\"value\":\"6\"}]}');
 INSERT INTO `param_config` VALUES (1474, 'AMF', '', 'association', 'TNL Association List', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"0~15\",\"display\":\"Index\",\"filter\":\"0~15\",\"name\":\"index\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"NGAP IP\",\"filter\":\"0~64\",\"name\":\"ngapIp\",\"type\":\"string\",\"value\":\"192.168.1.183\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"NGAP SCTP Port\",\"filter\":\"0~65535\",\"name\":\"ngapSctpPort\",\"type\":\"int\",\"value\":\"38412\"},{\"access\":\"read-write\",\"comment\":\"0~255\",\"display\":\"Weight\",\"filter\":\"0~255\",\"name\":\"weightFactor\",\"type\":\"int\",\"value\":\"255\"}]}');
 INSERT INTO `param_config` VALUES (1475, 'AMF', '', 'guami', 'GUAMI List', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"0~15\",\"display\":\"Index\",\"filter\":\"0~15\",\"name\":\"index\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PLMN ID\",\"filter\":\"^[0-9]{5,6}$\",\"name\":\"plmnId\",\"type\":\"regex\",\"value\":\"00101\"},{\"access\":\"read-write\",\"comment\":\"0~255\",\"display\":\"Region ID\",\"filter\":\"0~255\",\"name\":\"regionId\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"0~1023\",\"display\":\"Set ID\",\"filter\":\"0~1023\",\"name\":\"setId\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"0~63\",\"display\":\"Pointer\",\"filter\":\"0~63\",\"name\":\"pointer\",\"type\":\"int\",\"value\":\"1\"}]}');
 INSERT INTO `param_config` VALUES (1476, 'AMF', '', 'tai', 'TAI List', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"0~15\",\"display\":\"Index\",\"filter\":\"0~15\",\"name\":\"index\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PLMN ID\",\"filter\":\"^[0-9]{5,6}$\",\"name\":\"plmnId\",\"type\":\"regex\",\"value\":\"00101\"},{\"access\":\"read-write\",\"comment\":\"0~16777215\",\"display\":\"TAC\",\"filter\":\"0~8\",\"name\":\"tac\",\"type\":\"string\",\"value\":\"1\"}]}');
 INSERT INTO `param_config` VALUES (1477, 'AMF', '', 'slice', 'Slice List', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"0~15\",\"display\":\"Index\",\"filter\":\"0~15\",\"name\":\"index\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PLMN ID\",\"filter\":\"^[0-9]{5,6}$\",\"name\":\"plmnId\",\"type\":\"regex\",\"value\":\"00101\"},{\"access\":\"read-write\",\"comment\":\"0~127\",\"display\":\"SST\",\"filter\":\"0~127\",\"name\":\"sst\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"SD\",\"filter\":\"^[A-Fa-f0-9]{6}\",\"name\":\"sd\",\"type\":\"regex\",\"value\":\"000001\"}]}');
+
 INSERT INTO `param_config` VALUES (1480, 'MOCNGW', '', 'system', 'System Config', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"S1AP South Address\",\"filter\":\"0~64\",\"name\":\"s1apSouthAddr\",\"type\":\"string\",\"value\":\"192.168.7.163\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"S1AP North Address\",\"filter\":\"0~64\",\"name\":\"s1apNorthAddr\",\"type\":\"string\",\"value\":\"192.168.8.163\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"TAC\",\"filter\":\"0~65535\",\"name\":\"tac\",\"type\":\"int\",\"value\":\"1\"},{\"access\":\"read-write\",\"comment\":\"0~1048575\",\"display\":\"ENB ID\",\"filter\":\"0~1048575\",\"name\":\"enbId\",\"type\":\"int\",\"value\":\"24\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"User Plane Enabled\",\"filter\":\"{\\\"0\\\":\\\"false\\\",\\\"1\\\":\\\"true\\\"}\",\"name\":\"userPlaneEnabled\",\"type\":\"bool\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PFCP Address\",\"filter\":\"0~64\",\"name\":\"pfcpAddr\",\"type\":\"string\",\"value\":\"192.168.7.163\"}]}');
 INSERT INTO `param_config` VALUES (1481, 'MOCNGW', '', 'mme', 'MME List', '', '{\"array\":[{\"access\":\"read-only\",\"comment\":\"0~15\",\"display\":\"Index\",\"filter\":\"0~15\",\"name\":\"index\",\"type\":\"int\",\"value\":\"0\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"S1AP Address\",\"filter\":\"0~64\",\"name\":\"s1apAddr\",\"type\":\"string\",\"value\":\"192.168.1.161\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"S1AP Port\",\"filter\":\"0~65535\",\"name\":\"s1apPort\",\"type\":\"int\",\"value\":\"36412\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PLMN ID\",\"filter\":\"^[0-9]{5,6}$\",\"name\":\"plmnId\",\"type\":\"regex\",\"value\":\"00101\"}]}');
 INSERT INTO `param_config` VALUES (1482, 'MOCNGW', '', 'upgw', 'UPGW Config', '', '{\"list\":[{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"PFCP Address\",\"filter\":\"0~64\",\"name\":\"pfcpAddr\",\"type\":\"string\",\"value\":\"192.168.1.159\"},{\"access\":\"read-write\",\"comment\":\"0~65535\",\"display\":\"PFCP Port\",\"filter\":\"0~65535\",\"name\":\"pfcpPort\",\"type\":\"int\",\"value\":\"8805\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"GTP-U South Address\",\"filter\":\"0~64\",\"name\":\"gtpuSouthAddr\",\"type\":\"string\",\"value\":\"10.10.1.2\"},{\"access\":\"read-write\",\"comment\":\"\",\"display\":\"GTP-U North Address\",\"filter\":\"0~64\",\"name\":\"gtpuNorthAddr\",\"type\":\"string\",\"value\":\"192.168.7.123\"}]}');
--- a/database/install/sys_dict_data0.sql
+++ b/database/install/sys_dict_data0.sql
@@ -40,15 +40,15 @@ INSERT INTO `sys_dict_data` VALUES (12, 1, 'dictData.jobStatus.normal', '1', 'sy
 INSERT INTO `sys_dict_data` VALUES (13, 2, 'dictData.jobStatus.pause', '0', 'sys_job_status', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (14, 1, 'dictData.jobGroup.Default', 'DEFAULT', 'sys_job_group', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (15, 2, 'dictData.jobGroup.System', 'SYSTEM', 'sys_job_group', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (16, 1, 'dictData.operType.other', '0', 'sys_oper_type', NULL, 'processing', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (17, 2, 'dictData.operType.add', '1', 'sys_oper_type', NULL, 'processing', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (18, 3, 'dictData.operType.edit', '2', 'sys_oper_type', NULL, 'processing', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (19, 4, 'dictData.operType.delete', '3', 'sys_oper_type', NULL, 'error', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (20, 5, 'dictData.operType.auth', '4', 'sys_oper_type', NULL, 'success', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (21, 6, 'dictData.operType.export', '5', 'sys_oper_type', NULL, 'warning', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (22, 7, 'dictData.operType.import', '6', 'sys_oper_type', NULL, 'warning', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (23, 8, 'dictData.operType.forced quit', '7', 'sys_oper_type', NULL, 'error', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT INTO `sys_dict_data` VALUES (24, 9, 'dictData.operType.clear', '8', 'sys_oper_type', NULL, 'error', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (16, 1, 'dictData.operType.other', '0', 'sys_oper_type', NULL, 'purple', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (17, 2, 'dictData.operType.add', '1', 'sys_oper_type', NULL, 'blue', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (18, 3, 'dictData.operType.edit', '2', 'sys_oper_type', NULL, 'cyan', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (19, 4, 'dictData.operType.delete', '3', 'sys_oper_type', NULL, 'red', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (20, 5, 'dictData.operType.auth', '4', 'sys_oper_type', NULL, '#108ee9', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (21, 6, 'dictData.operType.export', '5', 'sys_oper_type', NULL, 'orange', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (22, 7, 'dictData.operType.import', '6', 'sys_oper_type', NULL, 'orange', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (23, 8, 'dictData.operType.forced quit', '7', 'sys_oper_type', NULL, 'default', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT INTO `sys_dict_data` VALUES (24, 9, 'dictData.operType.clear', '8', 'sys_oper_type', NULL, '#f50', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (25, 1, 'dictData.trace.interface', 'Interface', 'trace_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (26, 2, 'dictData.trace.device', 'Device', 'trace_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
 INSERT INTO `sys_dict_data` VALUES (27, 3, 'dictData.trace.user', 'UE', 'trace_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
--- a/database/upgrade/upg_alarm_event.sql
+++ b/database/upgrade/upg_alarm_event.sql
@@ -133,4 +133,9 @@ DELETE FROM `alarm` WHERE `orig_severity` = 'Event';

 COMMIT;

+DELETE FROM alarm_event WHERE id NOT IN (SELECT MIN(id) FROM alarm_event GROUP BY `ne_type`, `ne_id`, `alarm_id`, `event_time`);
+
+ALTER TABLE `alarm_event` 
+ADD UNIQUE INDEX IF NOT EXISTS `idx_uni_aid_ne_time`(`ne_type`, `ne_id`, `alarm_id`, `event_time`) USING BTREE;
+
 SET FOREIGN_KEY_CHECKS = 1;
--- a/database/upgrade/upg_sys_dict_data0.sql
+++ b/database/upgrade/upg_sys_dict_data0.sql
@@ -40,15 +40,15 @@ INSERT IGNORE INTO `sys_dict_data` VALUES (12, 1, 'dictData.jobStatus.normal', '
 INSERT IGNORE INTO `sys_dict_data` VALUES (13, 2, 'dictData.jobStatus.pause', '0', 'sys_job_status', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
 INSERT IGNORE INTO `sys_dict_data` VALUES (14, 1, 'dictData.jobGroup.Default', 'DEFAULT', 'sys_job_group', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
 INSERT IGNORE INTO `sys_dict_data` VALUES (15, 2, 'dictData.jobGroup.System', 'SYSTEM', 'sys_job_group', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (16, 1, 'dictData.operType.other', '0', 'sys_oper_type', NULL, 'processing', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (17, 2, 'dictData.operType.add', '1', 'sys_oper_type', NULL, 'processing', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (18, 3, 'dictData.operType.edit', '2', 'sys_oper_type', NULL, 'processing', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (19, 4, 'dictData.operType.delete', '3', 'sys_oper_type', NULL, 'error', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (20, 5, 'dictData.operType.auth', '4', 'sys_oper_type', NULL, 'success', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (21, 6, 'dictData.operType.export', '5', 'sys_oper_type', NULL, 'warning', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (22, 7, 'dictData.operType.import', '6', 'sys_oper_type', NULL, 'warning', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (23, 8, 'dictData.operType.forced quit', '7', 'sys_oper_type', NULL, 'error', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
-INSERT IGNORE INTO `sys_dict_data` VALUES (24, 9, 'dictData.operType.clear', '8', 'sys_oper_type', NULL, 'error', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT IGNORE INTO `sys_dict_data` VALUES (16, 1, 'dictData.operType.other', '0', 'sys_oper_type', NULL, 'purple', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT IGNORE INTO `sys_dict_data` VALUES (17, 2, 'dictData.operType.add', '1', 'sys_oper_type', NULL, 'blue', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT IGNORE INTO `sys_dict_data` VALUES (18, 3, 'dictData.operType.edit', '2', 'sys_oper_type', NULL, 'cyan', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT IGNORE INTO `sys_dict_data` VALUES (19, 4, 'dictData.operType.delete', '3', 'sys_oper_type', NULL, 'red', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT IGNORE INTO `sys_dict_data` VALUES (20, 5, 'dictData.operType.auth', '4', 'sys_oper_type', NULL, '#108ee9', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT IGNORE INTO `sys_dict_data` VALUES (21, 6, 'dictData.operType.export', '5', 'sys_oper_type', NULL, 'orange', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT IGNORE INTO `sys_dict_data` VALUES (22, 7, 'dictData.operType.import', '6', 'sys_oper_type', NULL, 'orange', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT IGNORE INTO `sys_dict_data` VALUES (23, 8, 'dictData.operType.forced quit', '7', 'sys_oper_type', NULL, 'default', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
+INSERT IGNORE INTO `sys_dict_data` VALUES (24, 9, 'dictData.operType.clear', '8', 'sys_oper_type', NULL, '#f50', '1', 'supervisor', 1699350000000, NULL, 0, NULL);
 INSERT IGNORE INTO `sys_dict_data` VALUES (25, 1, 'dictData.trace.interface', 'Interface', 'trace_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
 INSERT IGNORE INTO `sys_dict_data` VALUES (26, 2, 'dictData.trace.device', 'Device', 'trace_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
 INSERT IGNORE INTO `sys_dict_data` VALUES (27, 3, 'dictData.trace.user', 'UE', 'trace_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL);
--- a/features/fm/alarm.go
+++ b/features/fm/alarm.go
@@ -320,7 +320,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 			alarmLog.AlarmCode = alarmData.AlarmCode
 			alarmLog.AlarmStatus = alarmData.AlarmStatus
 			alarmLog.EventTime = eventTime
-			log.Debug("alarmLog:", alarmLog)
+			log.Trace("alarmLog:", alarmLog)

 			affected, err := session.Insert(alarmLog)
 			if err != nil && affected <= 0 {
@@ -434,7 +434,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 			if IsNeedToAckAlarm(valueJson, &alarmData) {
 				SetAlarmAckInfo(valueJson, &alarmData)
 			}
-			log.Debug("alarmData:", alarmData)
+			log.Trace("alarmData:", alarmData)
 			if alarmData.OrigSeverity == "Event" && config.GetYamlConfig().Alarm.SplitEventAlarm {
 				affected, err := xEngine.Table("alarm_event").InsertOne(alarmData)
 				if err != nil && affected <= 0 {
@@ -744,7 +744,20 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 					SetAlarmAckInfo(valueJson, &alarmData)
 				}
 				log.Trace("alarmData:", alarmData)
-				affected, err := session.Insert(alarmData)
+				var affected int64
+				if alarmData.OrigSeverity == "Event" && config.GetYamlConfig().Alarm.SplitEventAlarm {
+					affected, err = session.Table("alarm_event").InsertOne(alarmData)
+					if err != nil && affected <= 0 {
+						log.Error("Failed to insert alarm_event:", err)
+						continue
+					}
+				} else {
+					affected, err = session.Table("alarm").Insert(alarmData)
+					if err != nil && affected <= 0 {
+						log.Error("Failed to insert alarm:", err)
+						continue
+					}
+				}
 				if err == nil && affected > 0 {
 					alarmLog := new(AlarmLog)
 					alarmLog.NeType = alarmData.NeType
--- a/2
+++ b/2
@@ -3,7 +3,7 @@
 ProjectL = omc
 ProjectU = OMC
 PROJECT = $(ProjectL)
-VERSION = 2.2407.2
+VERSION = 2.2407.3
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
--- a/mkpkg.sh
+++ b/mkpkg.sh
@@ -2,7 +2,7 @@

 ProcList="restagent crontask sshsvc captrace data2html"
 ProjectL=omc
-VERSION=2.2407.2
+VERSION=2.2407.3
 RelDate=`date +%Y%m%d`
 Release=${RelDate}
 RelVer=${VERSION}-${RelDate}
--- a/restagent/makefile
+++ b/restagent/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project

 PROJECT = OMC
-VERSION = 2.2407.2
+VERSION = 2.2407.3
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
--- a/src/framework/config/config/config.default.yaml
+++ b/src/framework/config/config/config.default.yaml
@@ -1,7 +1,7 @@
 # 项目信息
 framework:
  name: "CN EMS"
-  version: "2.2407.2"
+  version: "2.2407.3"

 # 应用服务配置
 server:
--- a/sshsvc/makefile
+++ b/sshsvc/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project

 PROJECT = OMC
-VERSION = 2.2407.2
+VERSION = 2.2407.3
 LIBDIR = be.ems/lib
 BINNAME = sshsvc