feat: 合并Gin_Vue

features/udm_user/api_udm_user.go

@@ -228,7 +228,7 @@ func (s *UdmUserApi) UdmAuthUserList(w http.ResponseWriter, r *http.Request) {
 func (s *UdmUserApi) UdmAuthUserSave(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	if neId == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -244,7 +244,7 @@ func (s *UdmUserApi) UdmAuthUserInfo(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	imsi := ctx.Param(r, "imsi")
 	if neId == "" || imsi == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -290,14 +290,14 @@ func (s *UdmUserApi) UdmAuthUserInfo(w http.ResponseWriter, r *http.Request) {
 func (s *UdmUserApi) UdmAuthUserAdd(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	if neId == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
 	var body model.UdmAuthUser
 	err := ctx.ShouldBindJSON(r, &body)
 	if err != nil || body.Imsi == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -331,14 +331,14 @@ func (s *UdmUserApi) UdmAuthUserAdds(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	num := ctx.Param(r, "num")
 	if neId == "" || num == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
 	var body model.UdmAuthUser
 	err := ctx.ShouldBindJSON(r, &body)
 	if err != nil || body.Imsi == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -371,14 +371,14 @@ func (s *UdmUserApi) UdmAuthUserAdds(w http.ResponseWriter, r *http.Request) {
 func (s *UdmUserApi) UdmAuthUserEdit(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	if neId == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
 	var body model.UdmAuthUser
 	err := ctx.ShouldBindJSON(r, &body)
 	if err != nil || body.Imsi == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -425,7 +425,7 @@ func (s *UdmUserApi) UdmAuthUserRemove(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	imsi := ctx.Param(r, "imsi")
 	if neId == "" || imsi == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -460,7 +460,7 @@ func (s *UdmUserApi) UdmAuthUserRemoves(w http.ResponseWriter, r *http.Request)
 	imsi := ctx.Param(r, "imsi")
 	num := ctx.Param(r, "num")
 	if neId == "" || imsi == "" || num == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -497,16 +497,16 @@ func (s *UdmUserApi) UdmAuthUserExport(w http.ResponseWriter, r *http.Request) {
 	}
 	err := ctx.ShouldBindJSON(r, &body)
 	if err != nil || body.NeId == "" || body.Type == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
 	if !(body.Type == "csv" || body.Type == "txt") {
-		ctx.JSON(w, 200, result.ErrMsg("导出文件类型支持csv、txt"))
+		ctx.JSON(w, 200, result.ErrMsg("Export file types support CSV and txt"))
 		return
 	}
 
-	neId := "-"
+	neId := ""
 	list := s.authUser.List(model.UdmAuthUser{NeID: neId})
 	// 文件名
 	fileName := fmt.Sprintf("OMC_AUTH_USER_EXPORT_%s_%d.%s", neId, time.Now().UnixMilli(), body.Type)
@@ -554,7 +554,7 @@ func (s *UdmUserApi) UdmAuthUserExport(w http.ResponseWriter, r *http.Request) {
 func (s *UdmUserApi) UdmAuthUserImport(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	if neId == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -565,7 +565,7 @@ func (s *UdmUserApi) UdmAuthUserImport(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if !(strings.HasSuffix(fileHeader.Filename, ".csv") || strings.HasSuffix(fileHeader.Filename, ".txt")) {
-		ctx.JSON(w, 200, result.ErrMsg("请上传.csv、.txt格式文件，内容字段imsi,ki,algo,amf,opc"))
+		ctx.JSON(w, 200, result.ErrMsg("Please upload files in. csv and. txt formats with content fields: imsi,ki,algo,amf,opc"))
 		return
 	}
 
@@ -634,7 +634,7 @@ func (s *UdmUserApi) UdmSubUserList(w http.ResponseWriter, r *http.Request) {
 func (s *UdmUserApi) UdmSubUserSave(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	if neId == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -650,7 +650,7 @@ func (s *UdmUserApi) UdmSubUserInfo(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	imsi := ctx.Param(r, "imsi")
 	if neId == "" || imsi == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -714,14 +714,14 @@ func (s *UdmUserApi) UdmSubUserInfo(w http.ResponseWriter, r *http.Request) {
 func (s *UdmUserApi) UdmSubUserAdd(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	if neId == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
 	var body model.UdmSubUser
 	err := ctx.ShouldBindJSON(r, &body)
 	if err != nil || body.Imsi == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -760,14 +760,14 @@ func (s *UdmUserApi) UdmSubUserAdds(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	num := ctx.Param(r, "num")
 	if neId == "" || num == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
 	var body model.UdmSubUser
 	err := ctx.ShouldBindJSON(r, &body)
 	if err != nil || body.Imsi == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -805,14 +805,14 @@ func (s *UdmUserApi) UdmSubUserAdds(w http.ResponseWriter, r *http.Request) {
 func (s *UdmUserApi) UdmSubUserAdd4G(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	if neId == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
 	var body model.UdmSubUser
 	err := ctx.ShouldBindJSON(r, &body)
 	if err != nil || body.Imsi == "" || body.SubNum == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -845,14 +845,14 @@ func (s *UdmUserApi) UdmSubUserAdd4G(w http.ResponseWriter, r *http.Request) {
 func (s *UdmUserApi) UdmSubUserEdit(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	if neId == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
 	var body model.UdmSubUser
 	err := ctx.ShouldBindJSON(r, &body)
 	if err != nil || body.Imsi == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -940,14 +940,14 @@ func (s *UdmUserApi) UdmSubUserEdit(w http.ResponseWriter, r *http.Request) {
 func (s *UdmUserApi) UdmSubUser4GIP(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	if neId == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
 	var body model.UdmSubUser
 	err := ctx.ShouldBindJSON(r, &body)
 	if err != nil || body.Imsi == "" || body.SubNum == "" || body.StaticIp == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -979,14 +979,14 @@ func (s *UdmUserApi) UdmSubUser4GIP(w http.ResponseWriter, r *http.Request) {
 func (s *UdmUserApi) UdmSubUserSmData(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	if neId == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
 	var body model.UdmSubUser
 	err := ctx.ShouldBindJSON(r, &body)
 	if err != nil || body.Imsi == "" || body.SubNum == "" || body.SmData == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -1020,7 +1020,7 @@ func (s *UdmUserApi) UdmSubUserRemove(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	imsi := ctx.Param(r, "imsi")
 	if neId == "" || imsi == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -1055,7 +1055,7 @@ func (s *UdmUserApi) UdmSubUserRemoves(w http.ResponseWriter, r *http.Request) {
 	imsi := ctx.Param(r, "imsi")
 	num := ctx.Param(r, "num")
 	if neId == "" || imsi == "" || num == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -1092,16 +1092,16 @@ func (s *UdmUserApi) UdmSubUserExport(w http.ResponseWriter, r *http.Request) {
 	}
 	err := ctx.ShouldBindJSON(r, &body)
 	if err != nil || body.NeId == "" || body.Type == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
 	if !(body.Type == "csv" || body.Type == "txt") {
-		ctx.JSON(w, 200, result.ErrMsg("导出文件类型支持csv、txt"))
+		ctx.JSON(w, 200, result.ErrMsg("Export file type support csv、txt"))
 		return
 	}
 
-	neId := "-"
+	neId := ""
 	list := s.subUser.List(model.UdmSubUser{NeID: neId})
 	// 文件名
 	fileName := fmt.Sprintf("OMC_AUTH_USER_EXPORT_%s_%d.%s", neId, time.Now().UnixMilli(), body.Type)
@@ -1145,7 +1145,7 @@ func (s *UdmUserApi) UdmSubUserExport(w http.ResponseWriter, r *http.Request) {
 func (s *UdmUserApi) UdmSubUserImport(w http.ResponseWriter, r *http.Request) {
 	neId := ctx.Param(r, "neId")
 	if neId == "" {
-		ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
+		ctx.JSON(w, 400, result.CodeMsg(400, "parameter error"))
 		return
 	}
 
@@ -1156,7 +1156,7 @@ func (s *UdmUserApi) UdmSubUserImport(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if !(strings.HasSuffix(fileHeader.Filename, ".csv") || strings.HasSuffix(fileHeader.Filename, ".txt")) {
-		ctx.JSON(w, 200, result.ErrMsg("请上传.csv、.txt格式文件，内容字段imsi,msisdn,ambr,nssai,arfb,sar,rat,cn,smf_sel,sm_dat,eps_dat"))
+		ctx.JSON(w, 200, result.ErrMsg("Please upload files in. csv and. txt formats with content fields: imsi,msisdn,ambr,nssai,arfb,sar,rat,cn,smf_sel,sm_dat,eps_dat"))
 		return
 	}
 

features/udm_user/service/service_redis_data.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	"ems.agt/features/udm_user/model"
-	"ems.agt/lib/core/redis"
+	"ems.agt/src/framework/redis"
 )
 
 // phoneImsiList 获取所有imsi