From 9b23cfed11cb5f0eaa4b35a1e1b2649eea19e03c Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 9 Nov 2023 10:19:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20UDM=E7=AD=BE=E7=BA=A6=E5=AF=BC=E5=85=A5e?=
 =?UTF-8?q?ps=5Fdat=E5=8E=9F=E6=9D=A5=E7=9A=84=E7=AC=AC=E5=85=AD=E4=BD=8D?=
 =?UTF-8?q?=E4=B8=8D=E8=A6=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 features/udm_user/api_udm_user.go                 |  6 ++++--
 features/udm_user/service/service_redis_data.go   |  1 +
 features/udm_user/service/service_udm_sub_user.go | 12 ++++++------
 src/framework/config/config/config.default.yaml   |  1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/features/udm_user/api_udm_user.go b/features/udm_user/api_udm_user.go
index 303bcb09..55f79342 100644
--- a/features/udm_user/api_udm_user.go
+++ b/features/udm_user/api_udm_user.go
@@ -1104,7 +1104,8 @@ func (s *UdmUserApi) UdmSubUserExport(w http.ResponseWriter, r *http.Request) {
 		data := [][]string{}
 		data = append(data, []string{"imsi", "msisdn", "ambr", "nssai", "arfb", "sar", "rat", "cn", "smf_sel", "sm_dat", "eps_dat"})
 		for _, v := range list {
-			data = append(data, []string{v.Imsi, v.Msisdn, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, v.EpsDat})
+			epsDat := fmt.Sprintf("%s,%s,%s,%s,%s,%s,%s,%s", v.EpsFlag, v.EpsOdb, v.HplmnOdb, v.Ard, v.Epstpl, v.ContextId, v.ApnContext, v.StaticIp)
+			data = append(data, []string{v.Imsi, v.Msisdn, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, epsDat})
 		}
 		// 输出到文件
 		err = file.WriterCSVFile(data, filePath)
@@ -1118,7 +1119,8 @@ func (s *UdmUserApi) UdmSubUserExport(w http.ResponseWriter, r *http.Request) {
 		// 转换数据
 		data := [][]string{}
 		for _, v := range list {
-			data = append(data, []string{v.Imsi, v.Msisdn, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, v.EpsDat})
+			epsDat := fmt.Sprintf("%s,%s,%s,%s,%s,%s,%s,%s", v.EpsFlag, v.EpsOdb, v.HplmnOdb, v.Ard, v.Epstpl, v.ContextId, v.ApnContext, v.StaticIp)
+			data = append(data, []string{v.Imsi, v.Msisdn, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, epsDat})
 		}
 		// 输出到文件
 		err = file.WriterTxtFile(data, filePath)
diff --git a/features/udm_user/service/service_redis_data.go b/features/udm_user/service/service_redis_data.go
index e187d720..36b87a9e 100644
--- a/features/udm_user/service/service_redis_data.go
+++ b/features/udm_user/service/service_redis_data.go
@@ -109,6 +109,7 @@ func redisUdmSubUserList() []model.UdmSubUser {
 			a.Epstpl = arr[4]
 			a.ContextId = arr[5]
 			a.ApnContext = arr[7]
+			// [6] 是不要的，导入和导出不用
 			a.StaticIp = arr[8]
 		}
 
diff --git a/features/udm_user/service/service_udm_sub_user.go b/features/udm_user/service/service_udm_sub_user.go
index c66f790b..51dfe166 100644
--- a/features/udm_user/service/service_udm_sub_user.go
+++ b/features/udm_user/service/service_udm_sub_user.go
@@ -141,15 +141,15 @@ func (r *ServiceUdmSubUser) InsertCSV(neID string, data []map[string]string) int
 		if s, ok := v["eps_dat"]; ok {
 			subUser.EpsDat = s
 			arr := strings.Split(s, ",")
-			if len(arr) == 9 {
+			if len(arr) == 8 {
 				subUser.EpsFlag = arr[0]
 				subUser.EpsOdb = arr[1]
 				subUser.HplmnOdb = arr[2]
 				subUser.Ard = arr[3]
 				subUser.Epstpl = arr[4]
 				subUser.ContextId = arr[5]
-				subUser.ApnContext = arr[7]
-				subUser.StaticIp = arr[8]
+				subUser.ApnContext = arr[6]
+				subUser.StaticIp = arr[7]
 			}
 		}
 
@@ -180,15 +180,15 @@ func (r *ServiceUdmSubUser) InsertTxt(neID string, data [][]string) int64 {
 		subUser.Cn = v[7]
 		subUser.SmfSel = v[8]
 		subUser.SmData = v[9]
-		if len(v) > 18 {
+		if len(v) > 17 {
 			subUser.EpsFlag = v[10]
 			subUser.EpsOdb = v[11]
 			subUser.HplmnOdb = v[12]
 			subUser.Ard = v[13]
 			subUser.Epstpl = v[14]
 			subUser.ContextId = v[15]
-			subUser.ApnContext = v[17]
-			subUser.StaticIp = v[18]
+			subUser.ApnContext = v[16]
+			subUser.StaticIp = v[17]
 			subUser.EpsDat = strings.Join(v[10:], ",")
 		}
 
diff --git a/src/framework/config/config/config.default.yaml b/src/framework/config/config/config.default.yaml
index b864e892..7305c4a4 100644
--- a/src/framework/config/config/config.default.yaml
+++ b/src/framework/config/config/config.default.yaml
@@ -94,6 +94,7 @@ cors:
     - "X-Requested-With"
     - "Content-Type"
     - "Content-Language"
+    - "Accept-Language:"
     - "Accept"
     - "Range"
     - "Accesstoken"