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

2024-07-08 10:57:07 +08:00
parent a009c6db73 737c3dd368
commit 7255cc1d92
16 changed files with 66 additions and 43 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # 版本发布日志

+## 2.2407.1-20240704
+
+- 修复 网元版本安装MME修改S6A地址为MME_IP
+- 修复 网元公共参数n3/n6IP不携带/子网掩码处理异常
+- 更新 初始网元主机用omcuser/a9tU53r用密码登录方式
+- 更新 omc/log/内的level为warn
+- 更新 MML-OMC隐藏NBI配置项
+- 更新 多语言UE事件改为终端事件/CNType改5G&4G
+- 更新 多语言CDR翻译命名Voice CDR / Data CDR
+
 ## 2.2406.4-20240627

 - 更新 关闭crontask任务异常TaskHandShakeToNF
--- a/captrace/makefile
+++ b/captrace/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project

 PROJECT = OMC
-VERSION = 2.2406.4
+VERSION = 2.2407.1
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
--- a/crontask/makefile
+++ b/crontask/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project

 PROJECT = OMC
-VERSION = 2.2406.4
+VERSION = 2.2407.1
 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.2406.4
+VERSION = 2.2407.1
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
--- a/database/common/mml_command.sql
+++ b/database/common/mml_command.sql
@@ -55,7 +55,7 @@ INSERT INTO `mml_command` VALUES (1606, 'OMC', 'licenseManagement', 'License Man
 INSERT INTO `mml_command` VALUES (1607, 'OMC', 'licenseManagement', 'License Management', 'exp', 'license', 'Export NE License', '[{\"alias\":\"ne_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"name\":\"netype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"ne_id\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE ID\",\"filter\":\"\",\"name\":\"neid\",\"optional\":\"true\",\"type\":\"string\"}]', 'Inactive');
 INSERT INTO `mml_command` VALUES (1608, 'OMC', 'licenseManagement', 'License Management', 'uni', 'license', 'Uninstall NE License', '[{\"alias\":\"ne_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"name\":\"netype\",\"optional\":\"false\",\"type\":\"string\"},{\"alias\":\"ne_id\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE ID\",\"filter\":\"\",\"name\":\"neid\",\"optional\":\"false\",\"type\":\"string\"}]', 'Inactive');
 INSERT INTO `mml_command` VALUES (1609, 'OMC', 'licenseManagement', 'License Management', 'dsp', 'nelink', 'Display NE Interface Link Status', '[{\"alias\":\"ne_type\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"name\":\"netype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"ne_id\",\"comment\":\"\",\"display\":\"NE ID\",\"filter\":\"\",\"name\":\"neid\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"interface\",\"comment\":\"\",\"display\":\"Interface\",\"filter\":\"\",\"name\":\"interface\",\"optional\":\"true\",\"type\":\"string\"}]', 'Inactive');
-INSERT INTO `mml_command` VALUES (1610, 'OMC', 'nrmManagement', 'NBI Resources Management', 'dsp', 'nbicm', 'Display NBI Resources Management', '[{\"alias\":\"ne_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"name\":\"netype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"ne_id\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE ID\",\"filter\":\"\",\"name\":\"neid\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"rm_uid\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Resource management UID\",\"filter\":\"\",\"name\":\"rmuid\",\"optional\":\"true\",\"type\":\"string\"}]', 'Active');
+INSERT INTO `mml_command` VALUES (1610, 'OMC', 'nrmManagement', 'NBI Resources Management', 'dsp', 'nbicm', 'Display NBI Resources Management', '[{\"alias\":\"ne_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"name\":\"netype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"ne_id\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE ID\",\"filter\":\"\",\"name\":\"neid\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"rm_uid\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Resource management UID\",\"filter\":\"\",\"name\":\"rmuid\",\"optional\":\"true\",\"type\":\"string\"}]', 'Inactive');
 INSERT INTO `mml_command` VALUES (1611, 'OMC', 'neVersionManagement', 'NE Version Management', 'upg', 'neversion', 'Upgrade NE Software Version', '[{\"alias\":\"ne_type\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"netype\",\"optional\":\"false\",\"type\":\"string\"},{\"alias\":\"ne_id\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"NE ID\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"neid\",\"optional\":\"false\",\"type\":\"string\"},{\"alias\":\"version\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Version\",\"filter\":\"\",\"loc\":\"true\",\"name\":\"version\",\"optional\":\"false\",\"type\":\"string\"}]', 'Inactive');
 INSERT INTO `mml_command` VALUES (1612, 'OMC', 'pmTaskManagement', 'Performance Measure Task Management', 'lst', 'measuretask', 'List Performance Measure Task', '[{\"alias\":\"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\":\"\",\"name\":\"netype\",\"optional\":\"true\",\"type\":\"string\"},{\"alias\":\"granul_option\",\"apostr\":\"true\",\"comment\":\"\",\"display\":\"Time granularity\",\"filter\":\"\",\"name\":\"granuloption\",\"optional\":\"true\",\"type\":\"string\"}]', 'Active');
 INSERT INTO `mml_command` VALUES (1613, 'OMC', 'pmTaskManagement', 'Performance Measure Task Management', 'add', 'measuretask', 'Add Performance Measure Task', '[{\"alias\":\"ne_type\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"NE type\",\"filter\":\"\",\"loc\":\"false\",\"name\":\"netype\",\"optional\":\"false\",\"type\":\"string\"},{\"alias\":\"ne_ids\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"NE ID set\",\"filter\":\"\",\"loc\":\"false\",\"name\":\"neids\",\"optional\":\"false\",\"type\":\"array\"},{\"alias\":\"granul_option\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Granularity option\",\"filter\":\"\",\"loc\":\"false\",\"name\":\"granuloption\",\"optional\":\"false\",\"type\":\"string\"},{\"alias\":\"kpi_set\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"KPI set\",\"filter\":\"\",\"loc\":\"false\",\"name\":\"kpiset\",\"optional\":\"false\",\"type\":\"json\"},{\"alias\":\"start_time\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Measure task start time\",\"filter\":\"\",\"loc\":\"false\",\"name\":\"starttime\",\"optional\":\"false\",\"type\":\"string\"},{\"alias\":\"end_time\",\"apostr\":\"false\",\"comment\":\"\",\"display\":\"Measure task end time\",\"filter\":\"\",\"loc\":\"false\",\"name\":\"endtime\",\"optional\":\"false\",\"type\":\"string\"}]', 'Active');
--- a/database/install/ne_host.sql
+++ b/database/install/ne_host.sql
@@ -30,34 +30,34 @@ CREATE TABLE `ne_host`  (
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '网元主机表' ROW_FORMAT = DYNAMIC;

 -- 初始数据对应网元
-INSERT INTO `ne_host` VALUES (1, 'ssh', '1', 'OMC_001_22', '127.0.0.1', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (1, 'ssh', '1', 'OMC_001_22', '127.0.0.1', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (2, 'telnet', '1', 'OMC_001_4100', '127.0.0.1', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (3, 'ssh', '1', 'IMS_001_22', '172.16.5.110', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708314682742, NULL, 0);
+INSERT INTO `ne_host` VALUES (3, 'ssh', '1', 'IMS_001_22', '172.16.5.110', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708314682742, NULL, 0);
 INSERT INTO `ne_host` VALUES (4, 'telnet', '1', 'IMS_001_4100', '172.16.5.110', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (5, 'ssh', '1', 'AMF_001_22', '172.16.5.120', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708314682742, NULL, 0);
+INSERT INTO `ne_host` VALUES (5, 'ssh', '1', 'AMF_001_22', '172.16.5.120', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708314682742, NULL, 0);
 INSERT INTO `ne_host` VALUES (6, 'telnet', '1', 'AMF_001_4100', '172.16.5.120', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (7, 'ssh', '1', 'AUSF_001_22', '172.16.5.130', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (7, 'ssh', '1', 'AUSF_001_22', '172.16.5.130', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (8, 'telnet', '1', 'AUSF_001_4100', '172.16.5.130', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (9, 'ssh', '1', 'UDM_001_22', '172.16.5.140', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (9, 'ssh', '1', 'UDM_001_22', '172.16.5.140', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (10, 'telnet', '1', 'UDM_001_4100', '172.16.5.140', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (11, 'ssh', '1', 'SMF_001_22', '172.16.5.150', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (11, 'ssh', '1', 'SMF_001_22', '172.16.5.150', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (12, 'telnet', '1', 'SMF_001_4100', '172.16.5.150', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (13, 'ssh', '1', 'PCF_001_22', '172.16.5.160', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (13, 'ssh', '1', 'PCF_001_22', '172.16.5.160', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (14, 'telnet', '1', 'PCF_001_4100', '172.16.5.160', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (15, 'ssh', '1', 'NSSF_001_22', '172.16.5.170', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (15, 'ssh', '1', 'NSSF_001_22', '172.16.5.170', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (16, 'telnet', '1', 'NSSF_001_4100', '172.16.5.170', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (17, 'ssh', '1', 'NRF_001_22', '172.16.5.180', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (17, 'ssh', '1', 'NRF_001_22', '172.16.5.180', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (18, 'telnet', '1', 'NRF_001_4100', '172.16.5.180', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (19, 'ssh', '1', 'UPF_001_22', '172.16.5.190', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (19, 'ssh', '1', 'UPF_001_22', '172.16.5.190', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (20, 'telnet', '1', 'UPF_001_4100', '172.16.5.190', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (21, 'telnet', '1', 'UPF_001_5002', '172.16.5.190', 5002, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (22, 'ssh', '1', 'LMF_001_22', '172.16.5.200', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (22, 'ssh', '1', 'LMF_001_22', '172.16.5.200', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (23, 'telnet', '1', 'LMF_001_4100', '172.16.5.200', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (24, 'ssh', '1', 'NEF_001_22', '172.16.5.210', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (24, 'ssh', '1', 'NEF_001_22', '172.16.5.210', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (25, 'telnet', '1', 'NEF_001_4100', '172.16.5.210', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (26, 'ssh', '1', 'MME_001_22', '172.16.5.220', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (26, 'ssh', '1', 'MME_001_22', '172.16.5.220', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (27, 'telnet', '1', 'MME_001_4100', '172.16.5.220', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);
-INSERT INTO `ne_host` VALUES (28, 'ssh', '1', 'N3IWF_001_22', '172.16.5.230', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0);
+INSERT INTO `ne_host` VALUES (28, 'ssh', '1', 'N3IWF_001_22', '172.16.5.230', 22, 'omcuser', '0', 'E4Tm7TQuydT1aOXXYvjAIUnSSwqSPaeZ59Ls4qRcxZU=', '', '', '', 'admin', 1708333292882, NULL, 0);
 INSERT INTO `ne_host` VALUES (29, 'telnet', '1', 'N3IWF_001_4100', '172.16.5.230', 4100, 'admin', '0', 'gsjnG8iYpON7T9ae21l955gZi8RRsBWr2WRP31x6ENg=', '', '', '', 'admin', 1708333292882, NULL, 0);

 SET FOREIGN_KEY_CHECKS=1;
--- a/2
+++ b/2
@@ -3,7 +3,7 @@
 ProjectL = omc
 ProjectU = OMC
 PROJECT = $(ProjectL)
-VERSION = 2.2406.4
+VERSION = 2.2407.1
 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.2406.4
+VERSION=2.2407.1
 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.2406.4
+VERSION = 2.2407.1
 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.2406.4"
+  version: "2.2407.1"

 # 应用服务配置
 server:
--- a/src/framework/utils/ctx/ctx.go
+++ b/src/framework/utils/ctx/ctx.go
@@ -84,8 +84,8 @@ func Authorization(c *gin.Context) string {
 		return ""
 	}
 	// 拆分 Authorization 请求头，提取 JWT 令牌部分
-	arr := strings.Split(authHeader, token.HEADER_PREFIX)
-	if len(arr) == 2 && arr[1] == "" {
+	arr := strings.SplitN(authHeader, token.HEADER_PREFIX, 2)
+	if len(arr) < 2 {
 		return ""
 	}
 	return arr[1]
--- a/src/framework/utils/parse/parse.go
+++ b/src/framework/utils/parse/parse.go
@@ -172,10 +172,10 @@ func Color(colorStr string) *color.RGBA {
 	}
 }

-// ConvertIPMask 转换IP网络地址掩码 24 -> 255.255.255.0
+// ConvertIPMask 转换IP网络地址掩码 24->"255.255.255.0" 20->"255.255.240.0"
 func ConvertIPMask(bits int64) string {
 	if bits < 0 || bits > 32 {
-		return "Invalid Mask Bits"
+		return "255.255.255.255"
 	}

 	// 构建一个32位的uint32类型掩码，指定前bits位为1，其余为0
--- a/src/modules/network_element/service/ne_info.impl.go
+++ b/src/modules/network_element/service/ne_info.impl.go
@@ -705,20 +705,30 @@ func (r *NeInfoImpl) neConfPara5GDataConvert(content map[string]any) map[string]
 	}

 	n3IPAmdMask := external["upfn3_ip"].(string)
-	n3Arr := strings.Split(n3IPAmdMask, "/")
+	n3Arr := strings.SplitN(n3IPAmdMask, "/", 2)
 	n3IP := n3Arr[0]
-	n3Mask := parse.ConvertIPMask(parse.Number(n3Arr[1]))
+	n3Mask := "255.255.255.0"
+	if len(n3Arr) > 1 {
+		n3Mask = parse.ConvertIPMask(parse.Number(n3Arr[1]))
+	}

 	n6IPAmdMask := external["upfn6_ip"].(string)
-	n6Arr := strings.Split(n6IPAmdMask, "/")
+	n6Arr := strings.SplitN(n6IPAmdMask, "/", 2)
 	n6IP := n6Arr[0]
-	n6Mask := parse.ConvertIPMask(parse.Number(n6Arr[1]))
+	n6Mask := "255.255.255.0"
+	if len(n6Arr) > 1 {
+		n6Mask = parse.ConvertIPMask(parse.Number(n6Arr[1]))
+	}

 	ueIPAmdMask := external["ue_pool"].(string)
-	ueArr := strings.Split(ueIPAmdMask, "/")
+	ueArr := strings.SplitN(ueIPAmdMask, "/", 2)
 	ueIP := ueArr[0]
-	ueCicr := ueArr[1]
-	ueMask := parse.ConvertIPMask(parse.Number(ueArr[1]))
+	ueCicr := "24"
+	ueMask := "255.255.255.0"
+	if len(ueArr) > 1 {
+		ueCicr = ueArr[1]
+		ueMask = parse.ConvertIPMask(parse.Number(ueArr[1]))
+	}

 	return map[string]string{
 		// basic
--- a/src/modules/network_element/service/ne_version.impl.go
+++ b/src/modules/network_element/service/ne_version.impl.go
@@ -248,10 +248,11 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri
 			smsHost := fmt.Sprintf("%s smsc.%s smsc", para5GData["SIP_IP"], imsOrgHost)
 			cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s' /etc/hosts || echo '%s' | sudo tee -a /etc/hosts \n", smsHost, smsHost))
 			// adb
-			cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n")
-			cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["ADB_IP"]))
-			cmdStrArr = append(cmdStrArr, "sudo service adb restart \n")
-
+			if strings.Contains(pkgCmdStr, "adb") {
+				cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n")
+				cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["ADB_IP"]))
+				cmdStrArr = append(cmdStrArr, "sudo service adb restart \n")
+			}
 			cmdStrArr = append(cmdStrArr, "ims-stop || true && ims-start \n")
 			// 30s后停止服务
 			// cmdStrArr = append(cmdStrArr, "nohup sh -c \"sleep 30s && sudo ims-stop\" > /dev/null 2>&1 & \n")
@@ -326,9 +327,11 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri
 				cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/192.168.8.110/%s/g\" /usr/local/etc/udm/as.yaml \n", para5GData["SIP_IP"]))
 				cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s udm' /etc/hosts || echo '%s udm' | sudo tee -a /etc/hosts \n", para5GData["UDM_IP"], para5GData["UDM_IP"]))
 				// adb
-				cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n")
-				cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["ADB_IP"]))
-				cmdStrArr = append(cmdStrArr, "sudo service adb restart \n")
+				if strings.Contains(pkgCmdStr, "adb") {
+					cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n")
+					cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["ADB_IP"]))
+					cmdStrArr = append(cmdStrArr, "sudo service adb restart \n")
+				}
 			}
 			// SMF配置修改
 			if neTypeLower == "smf" {
@@ -448,7 +451,7 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri
 				cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i 's/TAC = 1;/TAC = %s;/g' /usr/local/etc/mme/mme.conf  \n", para5GData["TAC"]))
 				// SMF开启
 				cmdStrArr = append(cmdStrArr, "sudo sed -i \"/^ *gxcfg:/,/^ *[^ ]/{s/enable: false/enable: true/;b};\" /usr/local/etc/smf/smf_conf.yaml \n")
-				cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s mme' /etc/hosts || echo '%s mme' | sudo tee -a /etc/hosts \n", para5GData["S11_MMEIP"], para5GData["S11_MMEIP"]))
+				cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s mme' /etc/hosts || echo '%s mme' | sudo tee -a /etc/hosts \n", para5GData["MME_IP"], para5GData["MME_IP"]))
 			}
 			// N3IWF配置修改
 			if neTypeLower == "n3iwf" {
--- a/src/modules/system/repository/sys_user.impl.go
+++ b/src/modules/system/repository/sys_user.impl.go
@@ -254,7 +254,7 @@ func (r *SysUserImpl) SelectAllocatedPage(query map[string]any, dataScopeSQL str
 	}

 	// 构建查询条件语句
-	whereSql := " where u.del_flag = '0' "
+	whereSql := " where u.del_flag = '0' and u.user_id != '1' "
 	if len(conditions) > 0 {
 		whereSql += " and " + strings.Join(conditions, " and ")
 	}
--- a/sshsvc/makefile
+++ b/sshsvc/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project

 PROJECT = OMC
-VERSION = 2.2406.4
+VERSION = 2.2407.1
 LIBDIR = be.ems/lib
 BINNAME = sshsvc