fix: UDM鉴权用户去除Msisdn字段

features/udm_user/service/service_redis_data.go

@@ -1,7 +1,6 @@
 package service
 
 import (
-	"fmt"
 	"strings"
 
 	"ems.agt/features/udm_user/model"
@@ -9,28 +8,30 @@ import (
 )
 
 // phoneImsiList 获取所有imsi
-func phoneImsiList() map[string]string {
-	phoneAndImsiArr := make(map[string]string, 0)
-	phoneKeys, err := redis.GetKeys("udmuser", "1*********")
-	if err != nil {
-		return phoneAndImsiArr
-	}
-	for _, phone := range phoneKeys {
-		imsi, err := redis.Get("udmuser", phone)
-		if err != nil {
-			continue
-		}
-		phoneAndImsiArr[phone] = imsi
-	}
-	return phoneAndImsiArr
-}
+// func phoneImsiList() map[string]string {
+// 	phoneAndImsiArr := make(map[string]string, 0)
+// 	phoneKeys, err := redis.GetKeys("udmuser", "1*********")
+// 	if err != nil {
+// 		return phoneAndImsiArr
+// 	}
+// 	for _, phone := range phoneKeys {
+// 		imsi, err := redis.Get("udmuser", phone)
+// 		if err != nil {
+// 			continue
+// 		}
+// 		phoneAndImsiArr[phone] = imsi
+// 	}
+// 	return phoneAndImsiArr
+// }
 
 // redisUdmAuthUserList UDM鉴权用户
 func redisUdmAuthUserList() []model.UdmAuthUser {
-	phoneAndImsiArr := phoneImsiList()
 	user := []model.UdmAuthUser{}
-	for phone, imsi := range phoneAndImsiArr {
-		key := fmt.Sprintf("ausf:%s", imsi)
+	ausfArr, err := redis.GetKeys("udmuser", "ausf:*")
+	if err != nil {
+		return user
+	}
+	for _, key := range ausfArr {
 		m, err := redis.GetHash("udmuser", key)
 		if err != nil {
 			continue
@@ -40,10 +41,13 @@ func redisUdmAuthUserList() []model.UdmAuthUser {
 		if _, ok := m["auth_success"]; ok {
 			status = "1"
 		}
+		amf := ""
+		if v, ok := m["amf"]; ok {
+			amf = strings.Replace(v, "\r\n", "", 1)
+		}
 		a := model.UdmAuthUser{
-			Msisdn:    phone,
-			Imsi:      imsi,
-			Amf:       m["amf"],
+			Imsi:      key[5:],
+			Amf:       amf,
 			Status:    status,
 			Ki:        m["ki"],
 			AlgoIndex: m["algo"],
@@ -56,26 +60,25 @@ func redisUdmAuthUserList() []model.UdmAuthUser {
 
 // redisUdmSubUserList UDM签约用户
 func redisUdmSubUserList() []model.UdmSubUser {
-	phoneAndImsiArr := phoneImsiList()
+	// phoneAndImsiArr := phoneImsiList()
 	user := []model.UdmSubUser{}
-	for phone, imsi := range phoneAndImsiArr {
-		key := fmt.Sprintf("udm-sd:%s", imsi)
+	udmsdArr, err := redis.GetKeys("udmuser", "udm-sd:*")
+	if err != nil {
+		return user
+	}
+	for _, key := range udmsdArr {
 		m, err := redis.GetHash("udmuser", key)
 		if err != nil {
 			continue
 		}
 
 		a := model.UdmSubUser{
-			Imsi:   imsi,
-			Msisdn: m["gpsi"],
+			Imsi:   key[7:],
+			Msisdn: strings.TrimPrefix(m["gpsi"], "86"),
 			SmfSel: m["smf-sel"],
 			SmData: m["sm-dat"], // 1-000001&cmnet&ims&3gnet
 		}
 
-		if a.Msisdn == "" {
-			a.Msisdn = phone
-		}
-
 		// def_ambr,def_nssai,0,def_arfb,def_sar,3,1,12000,1,1000,0,1,-
 		if v, ok := m["am-dat"]; ok {
 			arr := strings.Split(v, ",")