marge: 合并代码

features/udm_user/service/service_redis_data.go

@@ -37,6 +37,12 @@ func redisUdmAuthUserList() []model.UdmAuthUser {
 			continue
 		}
 
+		// 跳过-号数据
+		imsi := key[5:]
+		if strings.Contains(imsi, "-") {
+			continue
+		}
+
 		status := "0"
 		if _, ok := m["auth_success"]; ok {
 			status = "1"
@@ -46,7 +52,7 @@ func redisUdmAuthUserList() []model.UdmAuthUser {
 			amf = strings.Replace(v, "\r\n", "", 1)
 		}
 		a := model.UdmAuthUser{
-			Imsi:      key[5:],
+			Imsi:      imsi,
 			Amf:       amf,
 			Status:    status,
 			Ki:        m["ki"],
@@ -73,7 +79,7 @@ func redisUdmSubUserList() []model.UdmSubUser {
 
 		a := model.UdmSubUser{
 			Imsi:   key[7:],
-			Msisdn: strings.TrimPrefix(m["gpsi"], "86"),
+			Msisdn: m["gpsi"], // 46003550072 strings.TrimPrefix(m["gpsi"], "86"),
 			SmfSel: m["smf-sel"],
 			SmData: m["sm-dat"], // 1-000001&cmnet&ims&3gnet
 		}
@@ -90,8 +96,12 @@ func redisUdmSubUserList() []model.UdmSubUser {
 		}
 		// 1,64,24,65,def_eps,1,2,010200000000,-
 		if v, ok := m["eps-dat"]; ok {
-			a.EpsDat = v
 			arr := strings.Split(v, ",")
+			// 跳过非常规数据
+			if len(arr) > 9 {
+				continue
+			}
+			a.EpsDat = v
 			a.EpsFlag = arr[0]
 			a.EpsOdb = arr[1]
 			a.HplmnOdb = arr[2]
@@ -99,6 +109,7 @@ func redisUdmSubUserList() []model.UdmSubUser {
 			a.Epstpl = arr[4]
 			a.ContextId = arr[5]
 			a.ApnContext = arr[7]
+			// [6] 是不要的，导入和导出不用
 			a.StaticIp = arr[8]
 		}