From 28f9ea94ce5dd3d7c6533698b3fd9652c40ac251 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Sat, 8 Mar 2025 11:00:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DIMSI=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A1=AE=E4=BF=9D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E5=A4=84=E7=90=86=E5=89=8D=E7=BC=80=E5=92=8C?=
 =?UTF-8?q?=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  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/modules/network_data/service/udm_auth.go b/src/modules/network_data/service/udm_auth.go
index 62812a35..481ed649 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 := key[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 894dae73..de4e215e 100644
--- a/src/modules/network_data/service/udm_sub.go
+++ b/src/modules/network_data/service/udm_sub.go
@@ -50,18 +50,18 @@ 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
 		}
 
 		a := model.UDMSubUser{
-			IMSI:   key[7:],   // udm-sd:360000100000130
+			IMSI:   imsi,      // udm-sd:360000100000130
 			MSISDN: m["gpsi"], // 8612300000130
 			NeId:   neId,
 			SmfSel: m["smf-sel"], // def_snssai