From 3e9a8fc067a0d9765f015079e5b2dd1b427aa657 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Sat, 8 Mar 2025 11:07:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DIMSI=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A1=AE?=
 =?UTF-8?q?=E4=BF=9D=E6=AD=A3=E7=A1=AE=E5=A4=84=E7=90=86=E5=89=8D=E7=BC=80?=
 =?UTF-8?q?=E5=92=8C=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/network_data/service/udm_auth.go | 6 +++---
 src/modules/network_data/service/udm_sub.go  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/modules/network_data/service/udm_auth.go b/src/modules/network_data/service/udm_auth.go
index cc291a3e..67b4e296 100644
--- a/src/modules/network_data/service/udm_auth.go
+++ b/src/modules/network_data/service/udm_auth.go
@@ -49,13 +49,13 @@ func (r *UDMAuthUser) dataByRedis(imsi, neId string) []model.UDMAuthUser {
 	}
 
 	for k, m := range mkv {
-		if k == "-" {
+		if len(k) != 20 {
 			continue
 		}
 
 		// 跳过-号数据 ausf:360000100000130
-		imsi := k[5:]
-		if strings.Contains(imsi, "-") {
+		imsi, hasPrefix := strings.CutPrefix(k, "ausf:")
+		if strings.Contains(imsi, "-") || !hasPrefix {
 			continue
 		}
 
diff --git a/src/modules/network_data/service/udm_sub.go b/src/modules/network_data/service/udm_sub.go
index 28c78fff..5ff990fe 100644
--- a/src/modules/network_data/service/udm_sub.go
+++ b/src/modules/network_data/service/udm_sub.go
@@ -50,13 +50,13 @@ func (r *UDMSubUser) dataByRedis(imsi, neId string) []model.UDMSubUser {
 	}
 
 	for k, m := range mkv {
-		if k == "-" {
+		if len(k) != 22 {
 			continue
 		}
 
 		// 跳过-号数据 udm-sd:360000100000130
-		imsi := k[7:]
-		if strings.Contains(imsi, "-") {
+		imsi, hasPrefix := strings.CutPrefix(k, "udm-sd:")
+		if strings.Contains(imsi, "-") || !hasPrefix {
 			continue
 		}
 

From 705d02aa786ebd8f40456bb867b0e02d97cbcf59 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Sat, 8 Mar 2025 11:07:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=202.2503.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md       | 6 ++++++
 makefile           | 2 +-
 mkpkg.sh           | 2 +-
 restagent/makefile | 2 +-
 sshsvc/makefile    | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af491e58..34056eaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # 版本发布日志
 
+## 2.2503.1-20250308
+
+- 优化 告警转发邮件优化
+- 优化 优化UPF流量统计逻辑
+- 优化 看板菜单权限控制部分显示
+
 ## 2.2502.4-20250228
 
 - 修复 SGW-C导出管理多语言显示
diff --git a/makefile b/makefile
index 628f94aa..b4df945b 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@
 ProjectL = omc
 ProjectU = OMC
 PROJECT = $(ProjectL)
-VERSION = 2.2502.4
+VERSION = 2.2503.1
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
diff --git a/mkpkg.sh b/mkpkg.sh
index 3af0f518..7553459a 100755
--- a/mkpkg.sh
+++ b/mkpkg.sh
@@ -2,7 +2,7 @@
 
 ProcList="restagent sshsvc"
 ProjectL=omc
-VERSION=2.2502.4
+VERSION=2.2503.1
 RelDate=`date +%Y%m%d`
 Release=${RelDate}
 RelVer=${VERSION}-${RelDate}
diff --git a/restagent/makefile b/restagent/makefile
index c4ac488c..4756c72d 100644
--- a/restagent/makefile
+++ b/restagent/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2502.4
+VERSION = 2.2503.1
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
diff --git a/sshsvc/makefile b/sshsvc/makefile
index 781de273..8d62cff6 100644
--- a/sshsvc/makefile
+++ b/sshsvc/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2502.4
+VERSION = 2.2503.1
 LIBDIR = be.ems/lib
 BINNAME = sshsvc