merge: 合并代码

features/cm/license.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"os/exec"
 	"strings"
-	"time"
 
 	"be.ems/lib/dborm"
 	"be.ems/lib/log"
@@ -29,11 +28,11 @@ var (
 func UploadLicenseFile(w http.ResponseWriter, r *http.Request) {
 	log.Debug("UploadLicenseFile processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Http request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Http request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["neType"]
@@ -51,11 +50,11 @@ func UploadLicenseFile(w http.ResponseWriter, r *http.Request) {
 func DownloadLicenseFile(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DownloadLicenseFile processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["neType"]
@@ -97,11 +96,11 @@ func DownloadLicenseFile(w http.ResponseWriter, r *http.Request) {
 func DeleteLcenseFile(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DeleteLcenseFile processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["neType"]
@@ -154,30 +153,30 @@ func DeleteLcenseFile(w http.ResponseWriter, r *http.Request) {
 	services.ResponseStatusOK204NoContent(w)
 }
 
-type MMLRequest struct {
-	MML []string `json:"mml"`
-}
+// type MMLRequest struct {
+// 	MML []string `json:"mml"`
+// }
 
-var TIME_DELAY_AFTER_WRITE time.Duration = 200
-var TIME_DEAD_LINE time.Duration = 10
+// var TIME_DELAY_AFTER_WRITE time.Duration = 200
+// var TIME_DEAD_LINE time.Duration = 10
 
-func init() {
-	if config.GetYamlConfig().MML.Sleep != 0 {
-		TIME_DELAY_AFTER_WRITE = time.Duration(config.GetYamlConfig().MML.Sleep)
-	}
-	if config.GetYamlConfig().MML.DeadLine != 0 {
-		TIME_DEAD_LINE = time.Duration(config.GetYamlConfig().MML.DeadLine)
-	}
-}
+// func init() {
+// 	if config.GetYamlConfig().MML.Sleep != 0 {
+// 		TIME_DELAY_AFTER_WRITE = time.Duration(config.GetYamlConfig().MML.Sleep)
+// 	}
+// 	if config.GetYamlConfig().MML.DeadLine != 0 {
+// 		TIME_DEAD_LINE = time.Duration(config.GetYamlConfig().MML.DeadLine)
+// 	}
+// }
 
 func UploadLicenseFileData(w http.ResponseWriter, r *http.Request) {
 	log.Info("UploadLicenseFileData processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Http request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Http request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
@@ -274,12 +273,13 @@ func UploadLicenseFileData(w http.ResponseWriter, r *http.Request) {
 	}
 	// backup system.ini to system.ini.bak
 	sshHost := fmt.Sprintf("%s@%s", config.GetYamlConfig().NE.User, neInfo.Ip)
-	cpCmd := fmt.Sprintf("sudo cp -f %s/system.ini %s/system.ini.bak", neLicensePath, neLicensePath)
+	cpCmd := fmt.Sprintf("sudo test -f %s/system.ini && cp -f %s/system.ini %s/system.ini.bak||echo 0",
+		neLicensePath, neLicensePath, neLicensePath)
 	cmd = exec.Command("ssh", sshHost, cpCmd)
 	out, err = cmd.CombinedOutput()
 	log.Debugf("Exec output: %v", string(out))
 	if err != nil {
-		log.Error("Faile to execute cp command:", err)
+		log.Errorf("Faile to execute cp command:%v, cmd:%s", err, cpCmd)
 		services.ResponseInternalServerError500ProcessError(w, err)
 		return
 	}

features/cm/ne.go

@@ -70,11 +70,11 @@ func init() {
 func GetNeInfo(w http.ResponseWriter, r *http.Request) {
 	log.Debug("GetNeInfo processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
@@ -112,11 +112,11 @@ type OmcNeConfig struct {
 func PostNeInfo(w http.ResponseWriter, r *http.Request) {
 	log.Debug("PostNeInfo processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
@@ -142,7 +142,8 @@ func PostNeInfo(w http.ResponseWriter, r *http.Request) {
 		services.ResponseInternalServerError500ProcessError(w, err)
 		return
 	}
-	neInfo.UpdateTime = time.Now().Format(time.DateTime)
+	//neInfo.UpdateTime = time.Now().Format(time.DateTime)
+	neInfo.UpdateTime = time.Now()
 	log.Debug("NE info:", neInfo)
 
 	//if !config.GetYamlConfig().OMC.Chk2Ne {
@@ -166,7 +167,7 @@ func PostNeInfo(w http.ResponseWriter, r *http.Request) {
 	} else {
 		hostUri := global.CombineHostUri(neInfo.Ip, neInfo.Port)
 		//hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port)
-		apiUri := fmt.Sprintf("%s/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig", config.DefaultUriPrefix, strings.ToLower(neInfo.NeType))
+		apiUri := fmt.Sprintf("%s/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig?ne_id=%s", config.DefaultUriPrefix, strings.ToLower(neInfo.NeType), neInfo.NeId)
 		requestURI2NF := fmt.Sprintf("%s%s", hostUri, apiUri)
 		log.Debug("requestURI2NF:", requestURI2NF)
 
@@ -226,11 +227,11 @@ func PostNeInfo(w http.ResponseWriter, r *http.Request) {
 func PutNeInfo(w http.ResponseWriter, r *http.Request) {
 	log.Debug("PutNeInfo processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
@@ -252,7 +253,7 @@ func PutNeInfo(w http.ResponseWriter, r *http.Request) {
 	neInfo := new(dborm.NeInfo)
 	_ = json.Unmarshal(body, neInfo)
 	neInfo.NeType = strings.ToUpper(neType)
-	neInfo.UpdateTime = time.Now().Format(time.DateTime)
+	neInfo.UpdateTime = time.Now()
 	log.Debug("NE info:", neInfo)
 
 	//if !config.GetYamlConfig().OMC.Chk2Ne {
@@ -276,7 +277,7 @@ func PutNeInfo(w http.ResponseWriter, r *http.Request) {
 	} else {
 		hostUri := global.CombineHostUri(neInfo.Ip, neInfo.Port)
 		//hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port)
-		apiUri := fmt.Sprintf("%s/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig", config.DefaultUriPrefix, neTypeLower)
+		apiUri := fmt.Sprintf("%s/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig?ne_id=%s", config.DefaultUriPrefix, neTypeLower, neInfo.NeId)
 		requestURI2NF := fmt.Sprintf("%s%s", hostUri, apiUri)
 		log.Debug("requestURI2NF:", requestURI2NF)
 
@@ -337,11 +338,11 @@ func PutNeInfo(w http.ResponseWriter, r *http.Request) {
 func DeleteNeInfo(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DeleteNeInfo processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
@@ -420,11 +421,11 @@ func IsActiveNF(neInfo *dborm.NeInfo) bool {
 func ExportCmFromNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("ExportCmFromNF processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
@@ -561,11 +562,11 @@ type ImportCMJson struct {
 func ImportCmToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("ImportCmToNF processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
@@ -595,12 +596,13 @@ func ImportCmToNF(w http.ResponseWriter, r *http.Request) {
 		path = config.GetYamlConfig().OMC.Backup
 	} else {
 		path = config.GetYamlConfig().OMC.Upload
-		fileName, err = services.HandleUploadFile(r, path, "")
+		fileNamePath, err := services.HandleUploadFile(r, path, "")
 		if err != nil {
 			log.Error("Faile to HandleUploadFile:", err)
 			services.ResponseInternalServerError500ProcessError(w, err)
 			return
 		}
+		fileName = fileNamePath
 	}
 	filePath := fmt.Sprintf("%s/%s", path, fileName)
 
@@ -722,11 +724,11 @@ func ImportCmToNF(w http.ResponseWriter, r *http.Request) {
 func DownloadNeBackupFile(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DownloadNeBackupFile processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["neType"]
@@ -767,11 +769,11 @@ func DownloadNeBackupFile(w http.ResponseWriter, r *http.Request) {
 func DeleteNeBackupFile(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DeleteNeBackupFile processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["neType"]
@@ -826,11 +828,11 @@ func DeleteNeBackupFile(w http.ResponseWriter, r *http.Request) {
 func PostNeServiceAction(w http.ResponseWriter, r *http.Request) {
 	log.Debug("PostNeServiceAction processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
@@ -857,15 +859,20 @@ func PostNeServiceAction(w http.ResponseWriter, r *http.Request) {
 	sshHost := fmt.Sprintf("%s@%s", config.GetYamlConfig().NE.User, neInfo.Ip)
 	switch neTypeLower {
 	case "omc":
-		actionCmd := fmt.Sprintf("sudo %s/bin/omcsvc.sh %s", config.GetYamlConfig().NE.OmcDir, action)
-		cmd := exec.Command("ssh", sshHost, actionCmd)
-		out, err := cmd.CombinedOutput()
-		log.Debugf("Exec output: %v", string(out))
-		if err != nil {
-			log.Errorf("Faile to execute ssh %s omc:%v", action, err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
+		// send 204 to fe firstly
+		services.ResponseStatusOK204NoContent(w)
+		//actionCmd := fmt.Sprintf("sudo %s/bin/omcsvc.sh %s", config.GetYamlConfig().NE.OmcDir, action)
+		actionCmd := fmt.Sprintf("sudo systemctl %s restagent", action)
+		go RunSSHCmd(sshHost, actionCmd)
+		return
+		// cmd := exec.Command("ssh", sshHost, actionCmd)
+		// out, err := cmd.CombinedOutput()
+		// log.Debugf("Exec output: %v", string(out))
+		// if err != nil {
+		// 	log.Errorf("Faile to execute ssh %s omc:%v", action, err)
+		// 	services.ResponseInternalServerError500ProcessError(w, err)
+		// 	return
+		// }
 	case "ims":
 		switch action {
 		case "start", "stop":
@@ -912,11 +919,11 @@ func PostNeServiceAction(w http.ResponseWriter, r *http.Request) {
 func PostNeInstanceAction(w http.ResponseWriter, r *http.Request) {
 	log.Debug("PostNeInstanceAction processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]

features/cm/param.go

@@ -3,7 +3,7 @@ package cm
 import (
 	"strings"
 
-	"be.ems/lib/dborm"
+	"be.ems/lib/core/utils/ctx"
 	"be.ems/lib/global"
 	"be.ems/lib/log"
 	"be.ems/lib/services"
@@ -14,7 +14,8 @@ import (
 	"io"
 	"net/http"
 
-	tokenConst "be.ems/src/framework/constants/token"
+	neService "be.ems/src/modules/network_element/service"
+
 	"github.com/go-resty/resty/v2"
 	"github.com/gorilla/mux"
 )
@@ -29,54 +30,20 @@ var (
 func GetParamConfigFromNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("GetParamConfigFromNF processing... ")
 
-	//	data := make([]map[string]interface{}, 1)
-	var response services.DataResponse
+	neId := ctx.GetQuery(r, "ne_id")
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
-	if neType == "" {
+	if neType == "" || neId == "" {
 		log.Error("elementTypeValue is empty")
 		services.ResponseNotFound404UriNotExist(w, r)
 		return
 	}
 
-	token, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	neInfo := neService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(neType, neId)
 
-	restHostPort := fmt.Sprintf("http://127.0.0.1:%d", config.GetYamlConfig().Rest[0].Port)
-	getNeInfoPattern := fmt.Sprintf(config.DefaultUriPrefix+"/databaseManagement/v1/%s/ne_info", config.GetYamlConfig().Database.Name)
-	getNeInfoURI := restHostPort + getNeInfoPattern
-	neId := services.GetUriParamString(r, "ne_id", ",", true, true)
-	if neId == "" {
-		getNeInfoURI = getNeInfoURI + fmt.Sprintf("?WHERE=status+in+('0','3')+and+ne_type='%s'", neType)
-	} else {
-		getNeInfoURI = getNeInfoURI + fmt.Sprintf("?WHERE=status+in+('0','3')+and+ne_type='%v'+and+ne_id+in+%v", neType, neId)
-	}
-	log.Debug("getNeInfoURI:", getNeInfoURI)
-
-	client := resty.New()
-	resp, err := client.R().
-		EnableTrace().
-		SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
-		SetHeaders(map[string]string{"accessToken": token}).
-		SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
-		SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
-		Get(getNeInfoURI)
-	if err != nil {
-		log.Error("Failed to Get:", err)
-		services.ResponseInternalServerError500ProcessError(w, err)
-		return
-	}
-	log.Trace("NE info:", string(resp.Body()))
-
-	//	var neList []dborm.NeInfo
-	neList, _ := dborm.XormParseResult(resp.Body())
-
-	if len(neList) >= 1 {
-		s := neList[0]
-		requestURI2NF := fmt.Sprintf("http://%s:%v%s", s.Ip, s.Port, r.RequestURI)
+	var response services.DataResponse
+	if neInfo.NeId == neId && neInfo.NeId != "" {
+		requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI)
 		log.Debug("requestURI2NF:", requestURI2NF)
 
 		resp, err := client.R().
@@ -100,30 +67,24 @@ func GetParamConfigFromNF(w http.ResponseWriter, r *http.Request) {
 func PostParamConfigToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("PostParamConfigToNF processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-
+	neId := ctx.GetQuery(r, "ne_id")
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
-	if neType == "" {
+	if neType == "" || neId == "" {
 		log.Error("elementTypeValue is empty")
 		services.ResponseNotFound404UriNotExist(w, r)
 		return
 	}
-	neId := services.GetUriParamString(r, "ne_id", ",", false, false)
 
-	//	no, _ := strconv.ParseInt(neId, 10, 64)
-	neInfo, err := dborm.XormGetNeInfo(neType, neId)
-	if err != nil {
-		log.Error("dborm.XormGetNeInfo is failed:", err)
+	neInfo := neService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(neType, neId)
+
+	if neInfo.NeId != neId || neInfo.NeId == "" {
+		log.Error("neId is empty")
 		services.ResponseInternalServerError500DatabaseOperationFailed(w)
 		return
 	}
 
-	requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.Ip, neInfo.Port, r.RequestURI)
+	requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI)
 	log.Debug("requestURI2NF: POST ", requestURI2NF)
 
 	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen)) //io.LimitReader限制大小
@@ -152,12 +113,6 @@ func PostParamConfigToNF(w http.ResponseWriter, r *http.Request) {
 func PutParamConfigToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("PutParamConfigToNF processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
 	if neType == "" {
@@ -172,16 +127,16 @@ func PutParamConfigToNF(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	neId := services.GetUriParamString(r, "ne_id", ",", false, false)
-	//	no, _ := strconv.ParseInt(neId, 10, 64)
-	neInfo, err := dborm.XormGetNeInfo(neType, neId)
-	if err != nil {
-		log.Error("dborm.XormGetNeInfo is failed:", err)
+	neId := ctx.GetQuery(r, "ne_id")
+	neInfo := neService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(neType, neId)
+
+	if neInfo.NeId != neId || neInfo.NeId == "" {
+		log.Error("neId is empty")
 		services.ResponseInternalServerError500DatabaseOperationFailed(w)
 		return
 	}
 
-	requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.Ip, neInfo.Port, r.RequestURI)
+	requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI)
 	log.Debug("requestURI2NF: PUT ", requestURI2NF)
 
 	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen)) //io.LimitReader限制大小
@@ -211,36 +166,12 @@ func PutParamConfigToNF(w http.ResponseWriter, r *http.Request) {
 //
 // 目前没配置，返回204
 func PutOMCNeConfig(w http.ResponseWriter, r *http.Request) {
-	// vars := mux.Vars(r)
-	// neType := vars["elementTypeValue"]
-	// if neType == "" {
-	// 	log.Error("elementTypeValue is empty")
-	// 	services.ResponseNotFound404UriNotExist(w, r)
-	// 	return
-	// }
-	// body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
-	// if err != nil {
-	// 	log.Error("Failed to io.ReadAll:", err)
-	// 	services.ResponseNotFound404UriNotExist(w, r)
-	// 	return
-	// }
-
-	// neInfo := new(dborm.NeInfo)
-	// _ = json.Unmarshal(body, neInfo)
-	// neInfo.NeType = strings.ToUpper(neType)
-
 	services.ResponseStatusOK204NoContent(w)
 }
 
 func DeleteParamConfigToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DeleteParamConfigToNF processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
 	if neType == "" {
@@ -248,17 +179,17 @@ func DeleteParamConfigToNF(w http.ResponseWriter, r *http.Request) {
 		services.ResponseNotFound404UriNotExist(w, r)
 		return
 	}
-	neId := services.GetUriParamString(r, "ne_id", ",", false, false)
 
-	//	no, _ := strconv.ParseInt(neId, 10, 64)
-	neInfo, err := dborm.XormGetNeInfo(neType, neId)
-	if err != nil {
-		log.Error("dborm.XormGetNeInfo is failed:", err)
+	neId := ctx.GetQuery(r, "ne_id")
+	neInfo := neService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(neType, neId)
+
+	if neInfo.NeId != neId || neInfo.NeId == "" {
+		log.Error("neId is empty")
 		services.ResponseInternalServerError500DatabaseOperationFailed(w)
 		return
 	}
 
-	requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.Ip, neInfo.Port, r.RequestURI)
+	requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI)
 	log.Debug("requestURI2NF: DELETE ", requestURI2NF)
 
 	client := resty.New()

features/cm/software.go

@@ -55,11 +55,11 @@ func verify_signature(public_key_name string, source_cms_file string, source_fil
 func UploadSoftwareFile(w http.ResponseWriter, r *http.Request) {
 	log.Debug("UploadSoftwareFile processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Http request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Http request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["neType"]
@@ -191,11 +191,11 @@ func UploadSoftwareFile(w http.ResponseWriter, r *http.Request) {
 func UploadSoftwareMultiFile(w http.ResponseWriter, r *http.Request) {
 	log.Info("UploadSoftwareMultiFile processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Http request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Http request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["neType"]
@@ -213,10 +213,21 @@ func UploadSoftwareMultiFile(w http.ResponseWriter, r *http.Request) {
 		services.ResponseNotFound404UriNotExist(w, r)
 		return
 	}
+
+	sql := fmt.Sprintf("select * from ne_software where ne_type='%s' and version='%s'", neTypeUpper, version)
+	neSoftwareInfo, _ := dborm.XormGetDataBySQL(sql)
+	if len(*neSoftwareInfo) >= 1 {
+		services.ResponseWithJson(w, 200, map[string]any{
+			"code": 0,
+			"msg":  "Software version already exists",
+		})
+		return
+	}
+
 	md5Param := services.GetUriParamString(r, "md5Sum", ",", false, false)
 
 	softwarePath := fmt.Sprintf("%s/%s", config.GetYamlConfig().OMC.Software, neTypeLower)
-	err = os.MkdirAll(softwarePath, os.ModePerm)
+	err := os.MkdirAll(softwarePath, os.ModePerm)
 	if err != nil {
 		log.Error("Failed to Mkdir:", err)
 		services.ResponseInternalServerError500ProcessError(w, err)
@@ -372,11 +383,11 @@ func UploadSoftwareMultiFile(w http.ResponseWriter, r *http.Request) {
 func DownloadSoftwareFile(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DownloadSoftwareFile processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["neType"]
@@ -418,11 +429,11 @@ func DownloadSoftwareFile(w http.ResponseWriter, r *http.Request) {
 func DeleteSoftwareFile(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DeleteSoftwareFile processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["neType"]
@@ -478,11 +489,11 @@ func DeleteSoftwareFile(w http.ResponseWriter, r *http.Request) {
 func DistributeSoftwareToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DistributeSoftwareFile processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Http request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Http request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["neType"]
@@ -618,11 +629,11 @@ func DistributeSoftwareToNF(w http.ResponseWriter, r *http.Request) {
 func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("ActiveSoftwareToNF processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Http request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Http request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["neType"]
@@ -825,11 +836,11 @@ func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) {
 func RollBackSoftwareToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("ActiveSoftwareToNF processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Http request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Http request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["neType"]
@@ -919,7 +930,7 @@ func RollBackSoftwareToNF(w http.ResponseWriter, r *http.Request) {
 				return
 			}
 			services.ResponseStatusOK204NoContent(w)
-			RunSSHCmd(sshHost, runCmd)
+			go RunSSHCmd(sshHost, runCmd)
 			return
 		}
 		err = RunSSHCmd(sshHost, runCmd)

features/dbrest/dbrest.go

@@ -77,18 +77,20 @@ type DatabaseClient struct {
 
 var DbClient DatabaseClient
 
-func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) error {
-	DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=true&loc=Local",
-		dbUser, dbPassword, dbHost, dbPort, dbName)
+func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName, dbParam string) error {
+	// DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=true&loc=Local",
+	// 	dbUser, dbPassword, dbHost, dbPort, dbName)
+	DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?%s",
+		dbUser, dbPassword, dbHost, dbPort, dbName, dbParam)
 	DbClient.dbType = dbType
 	DbClient.dbConnMaxLifetime = 0
 	DbClient.dbMaxIdleConns = 0
 	DbClient.dbMaxOpenConns = 0
+
 	if log.GetLevel() == log.LOG_TRACE {
 		DbClient.IsShowSQL = true
 	}
-	log.Debugf("dbType:%s dbUrl:%s:******@tcp(%s:%s)/%s??charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=true&loc=Local",
-		dbType, dbUser, dbHost, dbPort, dbName)
+	log.Debugf("dbType:%s dbUrl:%s:", dbType, DbClient.dbUrl)
 
 	var err error
 	DbClient.XEngine, err = xorm.NewEngine(DbClient.dbType, DbClient.dbUrl)
@@ -99,6 +101,8 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
 	DbClient.XEngine.SetConnMaxLifetime(DbClient.dbConnMaxLifetime)
 	DbClient.XEngine.SetMaxIdleConns(DbClient.dbMaxIdleConns)
 	DbClient.XEngine.SetMaxOpenConns(DbClient.dbMaxOpenConns)
+	DbClient.XEngine.DatabaseTZ = time.Local // 必须
+	DbClient.XEngine.TZLocation = time.Local // 必须
 	if DbClient.IsShowSQL {
 		//DbClient.XEngine.SetLogger(&log.Elogger)
 		DbClient.XEngine.ShowSQL(true)
@@ -188,13 +192,13 @@ func ExtDatabaseExecSQL(w http.ResponseWriter, r *http.Request) {
 	log.Debug("ExtDatabaseExecSQL processing... ")
 
 	var sql []string
-	var err error
+	// var err error
 
-	_, err = services.CheckExtValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err = services.CheckExtValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	//vars := mux.Vars(r)
 	//tblName := vars["objectTypeValue"]
@@ -249,11 +253,11 @@ func ExtDatabaseGetData(w http.ResponseWriter, r *http.Request) {
 	log.Debug("ExtDatabaseGetData processing... ")
 
 	var sql []string
-	token, err := services.CheckExtValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// token, err := services.CheckExtValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	pack := "dbrest"
 	vars := mux.Vars(r)
@@ -261,7 +265,7 @@ func ExtDatabaseGetData(w http.ResponseWriter, r *http.Request) {
 	dbname := vars["elementTypeValue"]
 	tbname := vars["objectTypeValue"]
 
-	log.Debugf("token:%s, method:%s, module:%s, dbname:%s, tbname:%s, pack:%s", token, r.Method, module, dbname, tbname, pack)
+	log.Debugf("method:%s, module:%s, dbname:%s, tbname:%s, pack:%s", r.Method, module, dbname, tbname, pack)
 
 	// exist, err := services.CheckUserPermission(token, strings.ToLower(r.Method), module, dbname, tbname, pack)
 	// if err != nil {
@@ -295,12 +299,11 @@ func ExtDatabaseGetData(w http.ResponseWriter, r *http.Request) {
 	for i, s := range sql {
 		log.Tracef("SQL[%d]: %s", i, sql[i])
 
-		rows := make([]map[string]interface{}, 0)
 		mapRows := make(map[string]interface{})
 
 		if s != "" {
 			//			err = XEngine.SQL(s).Find(&rows)
-			if IsQuerySQL(s) == false {
+			if !IsQuerySQL(s) {
 				services.ResponseNotAcceptable406QuerySQLError(w)
 				return
 			}
@@ -310,7 +313,7 @@ func ExtDatabaseGetData(w http.ResponseWriter, r *http.Request) {
 				querySQL = querySQL + " " + ls
 			}
 			log.Debug("querySQL:", querySQL)
-			rows, err = DbClient.XEngine.QueryInterface(querySQL)
+			rows, err := DbClient.XEngine.QueryInterface(querySQL)
 			if err != nil {
 				log.Error("SQL failed:", err)
 				services.ResponseInternalServerError500DatabaseOperationFailed(w)
@@ -332,11 +335,11 @@ func ExtDatabaseGetData(w http.ResponseWriter, r *http.Request) {
 func ExtDatabaseInsertData(w http.ResponseWriter, r *http.Request) {
 	log.Debug("ExtDatabaseInsertData processing... ")
 
-	token, err := services.CheckExtValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// token, err := services.CheckExtValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen)) //io.LimitReader限制大小
 	if err != nil {
@@ -351,7 +354,7 @@ func ExtDatabaseInsertData(w http.ResponseWriter, r *http.Request) {
 	tbname := vars["objectTypeValue"]
 	pack := "dbrest"
 
-	log.Debugf("token:%s, method:%s, module:%s, dbname:%s, tbname:%s, pack:%s", token, r.Method, module, dbname, tbname, pack)
+	log.Debugf("method:%s, module:%s, dbname:%s, tbname:%s, pack:%s", r.Method, module, dbname, tbname, pack)
 
 	// exist, err := services.CheckUserPermission(token, strings.ToLower(r.Method), module, dbname, tbname, pack)
 	// if err != nil {
@@ -396,11 +399,11 @@ func ExtDatabaseInsertData(w http.ResponseWriter, r *http.Request) {
 func ExtDatabaseUpdateData(w http.ResponseWriter, r *http.Request) {
 	log.Debug("ExtDatabaseUpdateData processing... ")
 
-	token, err := services.CheckExtValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// token, err := services.CheckExtValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	module := ""
@@ -408,7 +411,7 @@ func ExtDatabaseUpdateData(w http.ResponseWriter, r *http.Request) {
 	tbname := vars["objectTypeValue"]
 	pack := "dbrest"
 
-	log.Debugf("token:%s, method:%s, module:%s, dbname:%s, tbname:%s, pack:%s", token, r.Method, module, dbname, tbname, pack)
+	log.Debugf("method:%s, module:%s, dbname:%s, tbname:%s, pack:%s", r.Method, module, dbname, tbname, pack)
 
 	// exist, err := services.CheckUserPermission(token, strings.ToLower(r.Method), module, dbname, tbname, pack)
 	// if err != nil {
@@ -460,11 +463,11 @@ func ExtDatabaseUpdateData(w http.ResponseWriter, r *http.Request) {
 func ExtDatabaseDeleteData(w http.ResponseWriter, r *http.Request) {
 	log.Debug("ExtDatabaseDeleteData processing... ")
 
-	token, err := services.CheckExtValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// token, err := services.CheckExtValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	module := ""
@@ -472,7 +475,7 @@ func ExtDatabaseDeleteData(w http.ResponseWriter, r *http.Request) {
 	tbname := vars["objectTypeValue"]
 	pack := "dbreset"
 
-	log.Debugf("token:%s, method:%s, module:%, dbname:%s, tbname:%s pack:%s", token, r.Method, module, dbname, tbname, pack)
+	log.Debugf("method:%s, module:%, dbname:%s, tbname:%s pack:%s", r.Method, module, dbname, tbname, pack)
 
 	// exist, err := services.CheckUserPermission(token, strings.ToLower(r.Method), module, dbname, tbname, pack)
 	// if err != nil {
@@ -514,11 +517,11 @@ func DatabaseGetData(w http.ResponseWriter, r *http.Request) {
 	var sql []string
 	var err error
 
-	_, err = services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err = services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	tblName := vars["objectTypeValue"]
@@ -548,7 +551,7 @@ func DatabaseGetData(w http.ResponseWriter, r *http.Request) {
 
 		if s != "" {
 			//			err = XEngine.SQL(s).Find(&rows)
-			if IsQuerySQL(s) == false {
+			if !IsQuerySQL(s) {
 				services.ResponseNotAcceptable406QuerySQLError(w)
 				return
 			}
@@ -560,8 +563,8 @@ func DatabaseGetData(w http.ResponseWriter, r *http.Request) {
 			log.Debug("querySQL:", querySQL)
 			rows, err = DbClient.XEngine.QueryInterface(querySQL)
 			if err != nil {
-				log.Error("SQL failed:", err)
-				services.ResponseInternalServerError500DatabaseOperationFailed(w)
+				log.Error("QueryInterface failed:", err)
+				services.ResponseInternalServerError500ProcessError(w, err)
 				return
 			}
 			tableName := GetTableName(s)

features/file/file.go

@@ -37,11 +37,11 @@ var (
 func UploadFile(w http.ResponseWriter, r *http.Request) {
 	log.Debug("UploadFile processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Http request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Http request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	location := vars["location"]
@@ -63,20 +63,22 @@ func UploadFile(w http.ResponseWriter, r *http.Request) {
 	}
 	if location == "upload" {
 		path = config.GetYamlConfig().OMC.Upload
-		fileName, err = services.HandleUploadFile(r, path, fileName)
+		fileNamePath, err := services.HandleUploadFile(r, path, fileName)
 		if err != nil {
 			log.Error("Faile to HandleUploadFile:", err)
 			services.ResponseInternalServerError500ProcessError(w, err)
 			return
 		}
+		fileName = fileNamePath
 	} else {
 		path = config.GetYamlConfig().OMC.FrontUpload
-		fileName, err = services.HandleUploadFile(r, path, fileName)
+		fileName, err := services.HandleUploadFile(r, path, fileName)
 		if err != nil {
 			log.Error("Faile to HandleUploadFile:", err)
 			services.ResponseInternalServerError500ProcessError(w, err)
 			return
 		}
+		fileName = fileName
 	}
 	log.Debugf("upload file=%s to path=%s", fileName, path)
 
@@ -87,11 +89,11 @@ func UploadFile(w http.ResponseWriter, r *http.Request) {
 func DownloadFile(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DownloadFile processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	location := vars["location"]
@@ -132,11 +134,11 @@ func DownloadFile(w http.ResponseWriter, r *http.Request) {
 func DeleteFile(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DeleteFile processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["neType"]

features/fm/alarm.go

@@ -151,9 +151,9 @@ type DatabaseClient struct {
 
 var DbClient DatabaseClient
 
-func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) error {
-	DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=true&loc=Local",
-		dbUser, dbPassword, dbHost, dbPort, dbName)
+func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName, dbParam string) error {
+	DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?%s",
+		dbUser, dbPassword, dbHost, dbPort, dbName, dbParam)
 	DbClient.dbType = dbType
 	DbClient.dbConnMaxLifetime = 0
 	DbClient.dbMaxIdleConns = 0
@@ -161,8 +161,7 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
 	if log.GetLevel() == log.LOG_TRACE {
 		DbClient.IsShowSQL = true
 	}
-	log.Debugf("dbType:%s dbUrl:%s:******@tcp(%s:%s)/%s??charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=true&loc=Local",
-		dbType, dbUser, dbHost, dbPort, dbName)
+	log.Debugf("dbType:%s dbUrl:%s:", dbType, DbClient.dbUrl)
 
 	var err error
 	DbClient.XEngine, err = xorm.NewEngine(DbClient.dbType, DbClient.dbUrl)
@@ -173,6 +172,8 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
 	DbClient.XEngine.SetConnMaxLifetime(DbClient.dbConnMaxLifetime)
 	DbClient.XEngine.SetMaxIdleConns(DbClient.dbMaxIdleConns)
 	DbClient.XEngine.SetMaxOpenConns(DbClient.dbMaxOpenConns)
+	DbClient.XEngine.DatabaseTZ = time.Local // 必须
+	DbClient.XEngine.TZLocation = time.Local // 必须
 	if DbClient.IsShowSQL {
 		DbClient.XEngine.ShowSQL(true)
 	}
@@ -460,8 +461,8 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 			if err = AlarmEmailForward(&alarmData); err != nil {
 				log.Error("Failed to AlarmEmailForward:", err)
 			}
-			if err = AlarmForwardBySMSC(&alarmData); err != nil {
-				log.Error("Failed to AlarmForwardBySMSC:", err)
+			if err = AlarmSMSForward(&alarmData); err != nil {
+				log.Error("Failed to AlarmSMSForward:", err)
 			}
 		}
 	}
@@ -473,11 +474,11 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("GetAlarmFromNF processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
 	neTypeLower := strings.ToLower(neType)
@@ -491,7 +492,7 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 
 	//var neInfo *dborm.NeInfo
 	var nes []dborm.NeInfo
-	_, err = dborm.XormGetAllNeInfo(&nes)
+	_, err := dborm.XormGetAllNeInfo(&nes)
 	if err != nil {
 		log.Error("Failed to get all ne info:", err)
 		services.ResponseInternalServerError500ProcessError(w, err)
@@ -734,8 +735,8 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 						if err = AlarmEmailForward(&alarmData); err != nil {
 							log.Error("Failed to AlarmEmailForward:", err)
 						}
-						if err = AlarmForwardBySMSC(&alarmData); err != nil {
-							log.Error("Failed to AlarmForwardBySMSC:", err)
+						if err = AlarmSMSForward(&alarmData); err != nil {
+							log.Error("Failed to AlarmSMSForward:", err)
 						}
 					}
 				}

features/fm/smsforward.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"strings"
 	"time"
 
 	"be.ems/lib/dborm"
@@ -15,7 +16,24 @@ import (
 	"github.com/linxGnu/gosmpp/pdu"
 )
 
-func AlarmForwardBySMS(alarmData *Alarm) error {
+func AlarmSMSForward(alarmData *Alarm) error {
+	switch config.GetYamlConfig().Alarm.SMProxy {
+	case "sms":
+		users, err := AlarmForwardBySMS(alarmData)
+		writeLog(alarmData, users, "SMS", err)
+		return err
+	case "smsc":
+		users, err := AlarmForwardBySMPP(alarmData)
+		writeLog(alarmData, users, "SMS", err)
+		return err
+	default:
+		users, err := AlarmForwardBySMPP(alarmData)
+		writeLog(alarmData, users, "SMS", err)
+		return err
+	}
+}
+
+func AlarmForwardBySMS(alarmData *Alarm) (string, error) {
 	log.Info("AlarmForwardBySMS processing... ")
 
 	SMSFforwardconfig := config.GetYamlConfig().Alarm.SMS
@@ -29,91 +47,74 @@ func AlarmForwardBySMS(alarmData *Alarm) error {
 	toUsers, err := dborm.XormGetAlarmForward("SMS")
 	if err != nil {
 		log.Error("Failed to XormGetAlarmForward:", err)
-		return err
+		return "", err
 	} else if toUsers == nil {
 		err := errors.New("not found forward phone number")
 		log.Error(err)
-		return err
+		return "", err
+	}
+	userList := strings.Join(*toUsers, ",")
+
+	// 短信相关参数
+	params := url.Values{}
+	params.Set("PhoneNumbers", userList)
+	params.Set("SignName", SMSFforwardconfig.SignName)
+	params.Set("TemplateCode", SMSFforwardconfig.TemplateCode)
+	params.Set("TemplateParam", `{"message":"alarm"}`)
+
+	// 构建请求URL
+	reqURL := apiURL + "?Action=SendSms&" + params.Encode()
+
+	// 创建HTTP请求
+	req, err := http.NewRequest("GET", reqURL, nil)
+	if err != nil {
+		log.Error("Failed to create request:", err)
+		return userList, err
 	}
 
-	for _, toUser := range *toUsers {
-		// 短信相关参数
-		params := url.Values{}
-		params.Set("PhoneNumbers", toUser)
-		params.Set("SignName", SMSFforwardconfig.SignName)
-		params.Set("TemplateCode", SMSFforwardconfig.TemplateCode)
-		params.Set("TemplateParam", `{"message":"alarm"}`)
+	// 添加请求头部
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	req.Header.Set("Authorization", "APPCODE "+accessKeySecret)
 
-		// 构建请求URL
-		reqURL := apiURL + "?Action=SendSms&" + params.Encode()
-
-		// 创建HTTP请求
-		req, err := http.NewRequest("GET", reqURL, nil)
-		if err != nil {
-			log.Error("Failed to create request:", err)
-			return err
-		}
-
-		// 添加请求头部
-		req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-		req.Header.Set("Authorization", "APPCODE "+accessKeySecret)
-
-		forwardLog := &dborm.AlarmForwardLog{
-			NeType:     alarmData.NeType,
-			NeID:       alarmData.NeId,
-			AlarmID:    alarmData.AlarmId,
-			AlarmTitle: alarmData.AlarmTitle,
-			AlarmSeq:   alarmData.AlarmSeq,
-			EventTime:  alarmData.EventTime,
-			ToUser:     toUser,
-		}
-		// 发送请求
-		client := &http.Client{}
-		resp, err := client.Do(req)
-		if err != nil {
-			operResult := fmt.Sprintf("Failed to send request:%v", err)
-			log.Error(operResult)
-			forwardLog.OperResult = operResult
-			affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
-			if err != nil && affected <= 0 {
-				log.Error("Failed to insert data:", err)
-			}
-			continue
-		}
-		defer resp.Body.Close()
-
-		// 解析响应
-		if resp.StatusCode == http.StatusOK {
-			operResult := "SMS sent successfully!"
-			log.Info(operResult)
-			forwardLog.OperResult = operResult
-			affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
-			if err != nil && affected <= 0 {
-				log.Error("Failed to insert data:", err)
-				continue
-			}
-		} else {
-			operResult := fmt.Sprintf("Failed to send SMS, StatusCode=%d", resp.StatusCode)
-			log.Error(operResult)
-			forwardLog.OperResult = operResult
-			affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
-			if err != nil && affected <= 0 {
-				log.Error("Failed to insert data:", err)
-				continue
-			}
-		}
+	// 发送请求
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		log.Error("Failed to send request:%v", err)
+		return userList, err
+	}
+	defer resp.Body.Close()
+
+	// 解析响应
+	switch resp.StatusCode {
+	case http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusCreated:
+		return userList, nil
+	default:
+		err := fmt.Errorf("Failed to send SMS: %s(Code=%d)", resp.Status, resp.StatusCode)
+		log.Error(err)
+		return userList, err
 	}
-	return nil
 }
 
-func AlarmForwardBySMPP(alarmData *Alarm) error {
+func AlarmForwardBySMPP(alarmData *Alarm) (string, error) {
 	log.Info("AlarmForwardBySMPP processing... ")
 
+	toUsers, err := dborm.XormGetAlarmForward("SMS")
+	if err != nil {
+		log.Error("Failed to XormGetAlarmForward:", err)
+		return "", err
+	} else if toUsers == nil {
+		err := errors.New("not found forward phone number")
+		log.Error(err)
+		return "", err
+	}
+	userList := strings.Join(*toUsers, ",")
+
 	auth := gosmpp.Auth{
 		SMSC:       config.GetYamlConfig().Alarm.SMSC.Addr,
-		SystemID:   config.GetYamlConfig().Alarm.SMSC.UserName,
+		SystemID:   config.GetYamlConfig().Alarm.SMSC.SystemID,
 		Password:   config.GetYamlConfig().Alarm.SMSC.Password,
-		SystemType: "",
+		SystemType: config.GetYamlConfig().Alarm.SMSC.SystemType,
 	}
 
 	// conn, err := gosmpp.NonTLSDialer(auth.SMSC)
@@ -141,49 +142,50 @@ func AlarmForwardBySMPP(alarmData *Alarm) error {
 			},
 		}, -1)
 	if err != nil {
-		log.Error(err)
-		return err
+		log.Error("Failed to create SMPP new session:", err)
+		return userList, err
 	}
 	defer func() {
 		_ = trans.Close()
 	}()
 
-	toUsers, err := dborm.XormGetAlarmForward("SMS")
-	if err != nil {
-		log.Error("Failed to XormGetAlarmForward:", err)
-		return err
-	} else if toUsers == nil {
-		err := errors.New("not found forward phone number")
-		log.Error(err)
-		return err
-	}
 	// sending SMS(s)
-	for _, toUser := range *toUsers {
-		forwardLog := &dborm.AlarmForwardLog{
-			NeType:     alarmData.NeType,
-			NeID:       alarmData.NeId,
-			AlarmID:    alarmData.AlarmId,
-			AlarmTitle: alarmData.AlarmTitle,
-			AlarmSeq:   alarmData.AlarmSeq,
-			EventTime:  alarmData.EventTime,
-			ToUser:     toUser,
-		}
-		message := alarmData.AlarmTitle + "from" + alarmData.NeType + alarmData.NeId + "at" + alarmData.EventTime
-		if err = trans.Transceiver().Submit(newSubmitSM(toUser, message)); err != nil {
-			operResult := fmt.Sprintf("Failed to submit short message:%v", err)
-			log.Error(operResult)
-			forwardLog.OperResult = operResult
-		} else {
-			operResult := "SMS sent successfully!"
-			log.Trace(operResult)
-			forwardLog.OperResult = operResult
-		}
+	// var results []string
+	// for _, toUser := range *toUsers {
+	message := "Alarm Notification: " + alarmData.AlarmTitle + " from " + alarmData.NeType + " " + alarmData.NeId + " at " + alarmData.EventTime
+	if err = trans.Transceiver().Submit(newSubmitSM(userList, message)); err != nil {
+		// result := fmt.Sprintf("Failed to submit %s hort message:%s", toUser, err.Error())
+		// results = append(results, result)
+		log.Error("Failed to submit hort message:", err)
+		return userList, err
+	}
+	// }
+	return userList, nil
+}
 
-		affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
-		if err != nil && affected <= 0 {
-			log.Error("Failed to insert data:", err)
-			continue
-		}
+func writeLog(alarmData *Alarm, toUser, forwardBy string, err error) error {
+	var result string
+	if err == nil {
+		result = "SMS sent successfully"
+	} else {
+		result = err.Error()
+	}
+	forwardLog := &dborm.AlarmForwardLog{
+		NeType:     alarmData.NeType,
+		NeID:       alarmData.NeId,
+		AlarmID:    alarmData.AlarmId,
+		AlarmTitle: alarmData.AlarmTitle,
+		AlarmSeq:   alarmData.AlarmSeq,
+		EventTime:  alarmData.EventTime,
+		Interface:  forwardBy,
+		ToUser:     toUser,
+		OperResult: result,
+	}
+
+	affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
+	if err != nil && affected <= 0 {
+		log.Error("Failed to insert data:", err)
+		return err
 	}
 	return nil
 }

features/fm/ucpcli.go

@@ -13,9 +13,9 @@ import (
 func AlarmForwardBySMSC(alarmData *Alarm) error {
 	opt := &ucp.Options{
 		Addr:       config.GetYamlConfig().Alarm.SMSC.Addr,
-		User:       config.GetYamlConfig().Alarm.SMSC.UserName,
+		User:       config.GetYamlConfig().Alarm.SMSC.SystemID,
 		Password:   config.GetYamlConfig().Alarm.SMSC.Password,
-		AccessCode: "",
+		AccessCode: config.GetYamlConfig().Alarm.SMSC.SystemType,
 	}
 
 	client := ucp.New(opt)

features/lm/logbak.go

@@ -50,9 +50,9 @@ var DbClient DatabaseClient
 // 		conf.Database.Host, conf.Database.Port, conf.Database.Name)
 // }
 
-func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) error {
-	DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=true&loc=Local",
-		dbUser, dbPassword, dbHost, dbPort, dbName)
+func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName, dbParam string) error {
+	DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?%s",
+		dbUser, dbPassword, dbHost, dbPort, dbName, dbParam)
 	DbClient.dbType = dbType
 	DbClient.dbConnMaxLifetime = 0
 	DbClient.dbMaxIdleConns = 0
@@ -60,8 +60,7 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
 	if log.GetLevel() == log.LOG_TRACE {
 		DbClient.IsShowSQL = true
 	}
-	log.Debugf("dbType:%s dbUrl:%s:******@tcp(%s:%s)/%s??charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=true&loc=Local",
-		dbType, dbUser, dbHost, dbPort, dbName)
+	log.Debugf("dbType:%s dbUrl:%s:", dbType, DbClient.dbUrl)
 
 	var err error
 	DbClient.XEngine, err = xorm.NewEngine(DbClient.dbType, DbClient.dbUrl)
@@ -72,6 +71,8 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
 	DbClient.XEngine.SetConnMaxLifetime(DbClient.dbConnMaxLifetime)
 	DbClient.XEngine.SetMaxIdleConns(DbClient.dbMaxIdleConns)
 	DbClient.XEngine.SetMaxOpenConns(DbClient.dbMaxOpenConns)
+	DbClient.XEngine.DatabaseTZ = time.Local // 必须
+	DbClient.XEngine.TZLocation = time.Local // 必须
 	if DbClient.IsShowSQL {
 		DbClient.XEngine.ShowSQL(true)
 	}
@@ -83,18 +84,18 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
 func ExtDatabaseBackupData(w http.ResponseWriter, r *http.Request) {
 	log.Debug("ExtDatabaseBackupData processing... ")
 
-	token, err := services.CheckExtValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// token, err := services.CheckExtValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	module := vars["managementModule"]
 	dbname := vars["dataStorage"]
 	tbname := vars["dataObject"]
 	pack := "lm"
-	log.Debugf("token:%s, method:%s, module:%s dbname:%s, tbname:%s pack:%s", token, r.Method, module, dbname, tbname, pack)
+	log.Debugf("method:%s, module:%s dbname:%s, tbname:%s pack:%s", r.Method, module, dbname, tbname, pack)
 	// exist, err := services.CheckUserPermission(token, strings.ToLower(r.Method), module, dbname, tbname, pack)
 	// if err != nil {
 	// 	log.Error("Failed to get permission:", err)

features/maintenance/maintenance.go

@@ -216,7 +216,7 @@ func SqlClient(w http.ResponseWriter, r *http.Request) {
 	if isConnet == "connet" && dborm.DbClient.XEngine == nil {
 		conf := config.GetYamlConfig()
 		err := dborm.InitDbClient(conf.Database.Type, conf.Database.User, conf.Database.Password,
-			conf.Database.Host, conf.Database.Port, conf.Database.Name)
+			conf.Database.Host, conf.Database.Port, conf.Database.Name, conf.Database.ConnParam)
 		if err != nil {
 			fmt.Println("dborm.initDbClient err:", err)
 			services.ResponseInternalServerError500DatabaseOperationFailed(w)

features/mml/mml.go

@@ -51,16 +51,24 @@ var (
 	CustomUriOmMmlInt = config.UriPrefix + "/omManagement/{apiVersion}/mml/{neType}/{neId}"
 )
 
-var TIME_DELAY_AFTER_WRITE time.Duration = 200
-var TIME_DEAD_LINE time.Duration = 10
+var (
+	TIME_DELAY_AFTER_WRITE time.Duration = 200
+	TIME_DEAD_LINE         time.Duration = 10
+	WIN_ROW_SIZE           byte          = 100
+	WIN_COL_SIZE           byte          = 100
+	BUFFER_SIZE            int           = 65535
+)
 
-func init() {
+func InitMML() {
 	if config.GetYamlConfig().MML.Sleep != 0 {
 		TIME_DELAY_AFTER_WRITE = time.Duration(config.GetYamlConfig().MML.Sleep)
 	}
 	if config.GetYamlConfig().MML.DeadLine != 0 {
 		TIME_DEAD_LINE = time.Duration(config.GetYamlConfig().MML.DeadLine)
 	}
+	WIN_ROW_SIZE = config.GetYamlConfig().MML.SizeRow
+	WIN_COL_SIZE = config.GetYamlConfig().MML.SizeCol
+	BUFFER_SIZE = config.GetYamlConfig().MML.BufferSize
 }
 
 func PostMML2ToNF(w http.ResponseWriter, r *http.Request) {
@@ -78,8 +86,7 @@ func PostMML2ToNF(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var buf [20 * 1024]byte
-	//buf := make([]byte, 0)
+	buf := make([]byte, BUFFER_SIZE)
 	var n int
 	var mmlResult []string
 	port2 := 5002
@@ -90,6 +97,7 @@ func PostMML2ToNF(w http.ResponseWriter, r *http.Request) {
 	if neInfo != nil {
 		hostMML := fmt.Sprintf("%s:%d", neInfo.Ip, port2)
 		conn, err := net.Dial("tcp", hostMML)
+		//conn, err := net.Dial("tcp", hostMML)
 		if err != nil {
 			errMsg := fmt.Sprintf("Failed to dial %s: %v", hostMML, err)
 			log.Error(errMsg)
@@ -110,6 +118,9 @@ func PostMML2ToNF(w http.ResponseWriter, r *http.Request) {
 		// 	services.ResponseWithJson(w, http.StatusOK, response)
 		// 	return
 		// }
+		// 发送窗口大小设置命令
+		conn.Write([]byte{255, 251, 31})                                             // 发送WILL WINDOW SIZE
+		conn.Write([]byte{255, 250, 31, 0, WIN_ROW_SIZE, 0, WIN_COL_SIZE, 255, 240}) // 发送设置 WINDOW SIZE
 
 		conn.SetDeadline(time.Now().Add(TIME_DEAD_LINE * time.Second))
 		loginStr := fmt.Sprintf("%s\n%s\n", config.GetYamlConfig().MML.User, config.GetYamlConfig().MML.Password)
@@ -172,7 +183,7 @@ func PostMML2ToNF(w http.ResponseWriter, r *http.Request) {
 			//re2 := regexp.MustCompile(`\x00`) // 匹配空字符
 			re2 := regexp.MustCompile(`[\x00-\x08\x0B\x0C\x0E-\x1F\x7F\x1B]`) // 匹配空字符和包含␛的控制字符
 			//re := regexp.MustCompile(`[\x00-\x1F\x7F]`)
-			result := re1.ReplaceAllString(string(buf[0:n-len(neType)-2]), "")
+			result := re1.ReplaceAllString(string(buf[0:n]), "")
 			result = re2.ReplaceAllString(result, "")
 			mmlResult = append(mmlResult, result)
 		}
@@ -186,11 +197,11 @@ func PostMML2ToNF(w http.ResponseWriter, r *http.Request) {
 func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("PostMMLToNF processing... ")
 
-	token, err := services.CheckExtValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// token, err := services.CheckExtValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 	// 经过测试，linux下，延时需要大于100ms
 	// var TIME_DELAY_AFTER_WRITE time.Duration = 200
 	// var TIME_DEAD_LINE time.Duration = 10
@@ -214,8 +225,7 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 	}
 	log.Debug("neType:", neType, "neId", neId)
 
-	log.Debugf("token:%s, method:%s, managementType:%s dbname:%s, tbname:%s pack:%s",
-		token, r.Method, module, neType, neId[0], pack)
+	log.Debugf("method:%s, managementType:%s dbname:%s, tbname:%s pack:%s", r.Method, module, neType, neId[0], pack)
 
 	var buf [20 * 1024]byte
 	//buf := make([]byte, 0)
@@ -250,7 +260,7 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 	}
 
 	neInfo := new(dborm.NeInfo)
-	neInfo, err = dborm.XormGetNeInfo(neType, neId[0])
+	neInfo, err := dborm.XormGetNeInfo(neType, neId[0])
 	if err != nil {
 		log.Error("dborm.XormGetNeInfo is failed:", err)
 		services.ResponseInternalServerError500DatabaseOperationFailed(w)
@@ -631,11 +641,11 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 func PostMMLToOMC(w http.ResponseWriter, r *http.Request) {
 	log.Debug("PostMMLToOMC processing... ")
 
-	token, err := services.CheckExtValidRequest(w, r)
-	if err != nil {
-		log.Error("Failed to CheckMmlValidRequest:", err)
-		return
-	}
+	// token, err := services.CheckExtValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Failed to CheckMmlValidRequest:", err)
+	// 	return
+	// }
 
 	params := r.URL.Query()
 	neId := params["ne_id"]
@@ -646,7 +656,7 @@ func PostMMLToOMC(w http.ResponseWriter, r *http.Request) {
 	}
 
 	neInfo := new(dborm.NeInfo)
-	neInfo, err = dborm.XormGetNeInfo("OMC", neId[0])
+	neInfo, err := dborm.XormGetNeInfo("OMC", neId[0])
 	if err != nil {
 		log.Error("dborm.XormGetNeInfo is failed:", err)
 		services.ResponseInternalServerError500DatabaseOperationFailed(w)
@@ -670,7 +680,7 @@ func PostMMLToOMC(w http.ResponseWriter, r *http.Request) {
 		MmlHome:       config.GetYamlConfig().MML.MmlHome,
 		Limit:         50,
 		User:          "",
-		SessionToken:  token,                               // 旧token
+		SessionToken:  "",                                  // 旧token
 		Authorization: r.Header.Get(tokenConst.HEADER_KEY), // 请求Token
 		HttpUri:       hostUri,
 		UserAgent:     config.GetDefaultUserAgent(),

features/pm/performance.go

@@ -8,6 +8,7 @@ import (
 	"math"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 
 	"be.ems/lib/dborm"
@@ -63,6 +64,26 @@ type GoldKpi struct {
 	Timestamp   string `json:"timestamp"`
 }
 
+type KpiData struct {
+	ID          int       `json:"id" xorm:"pk 'id' '<-' autoincr"`
+	NEType      string    `json:"neType" xorm:"ne_type"`
+	NEName      string    `json:"neName" xorm:"ne_name"`
+	RmUid       string    `json:"rmUid" xorm:"rm_uid"`
+	Date        string    `json:"date" xorm:"date"`
+	StartTime   time.Time `json:"startTime" xorm:"start_time"`
+	EndTime     time.Time `json:"endTime" xorm:"end_time"`
+	Index       int       `json:"index" xorm:"index"`
+	Granularity int8      `json:"granularity" xorm:"granularity"`
+	KPIValues   []KPIVal  `json:"kpiValues" xorm:"json 'kpi_values'"`
+	//CreatedAt   int64     `json:"createdAt" xorm:"created 'created_at'"`
+	CreatedAt int64 `json:"createdAt" xorm:"'created_at'"`
+}
+type KPIVal struct {
+	KPIID string `json:"kpi_id" xorm:"kpi_id"`
+	Value int64  `json:"value" xorm:"value"`
+	Err   string `json:"err" xorm:"err"`
+}
+
 var (
 	// performance management
 	PerformanceUri   = config.DefaultUriPrefix + "/performanceManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/kpiReport/{index}"
@@ -96,9 +117,9 @@ type DatabaseClient struct {
 
 var DbClient DatabaseClient
 
-func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) error {
-	DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=true&loc=Local",
-		dbUser, dbPassword, dbHost, dbPort, dbName)
+func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName, dbParam string) error {
+	DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?%s",
+		dbUser, dbPassword, dbHost, dbPort, dbName, dbParam)
 	DbClient.dbType = dbType
 	DbClient.dbConnMaxLifetime = 0
 	DbClient.dbMaxIdleConns = 0
@@ -106,8 +127,7 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
 	if log.GetLevel() == log.LOG_TRACE {
 		DbClient.IsShowSQL = true
 	}
-	log.Debugf("dbType:%s dbUrl:%s:******@tcp(%s:%s)/%s??charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=true&loc=Local",
-		dbType, dbUser, dbHost, dbPort, dbName)
+	log.Debugf("dbType:%s dbUrl:%s:", dbType, DbClient.dbUrl)
 
 	var err error
 	DbClient.XEngine, err = xorm.NewEngine(DbClient.dbType, DbClient.dbUrl)
@@ -118,11 +138,28 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
 	DbClient.XEngine.SetConnMaxLifetime(DbClient.dbConnMaxLifetime)
 	DbClient.XEngine.SetMaxIdleConns(DbClient.dbMaxIdleConns)
 	DbClient.XEngine.SetMaxOpenConns(DbClient.dbMaxOpenConns)
+	DbClient.XEngine.DatabaseTZ = time.Local // 必须
+	DbClient.XEngine.TZLocation = time.Local // 必须
 	if DbClient.IsShowSQL {
 		DbClient.XEngine.ShowSQL(true)
 	}
 	xEngine = DbClient.XEngine
 
+	// exist, err := xEngine.IsTableExist("kpi_report")
+	// if err != nil {
+	// 	log.Error("Failed to IsTableExist:", err)
+	// 	return err
+	// }
+	// if exist {
+	// 	// 复制表结构到新表
+	// 	sql := fmt.Sprintf("CREATE TABLE IF NOT EXISTS `%s` AS SELECT * FROM kpi_report WHERE 1=0", "kpi_report_amf")
+	// 	_, err := xEngine.Exec(sql)
+	// 	if err != nil {
+	// 		log.Error("Failed to Exec:", err)
+	// 		return err
+	// 	}
+	// }
+
 	return nil
 }
 
@@ -203,12 +240,34 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		"startIndex": goldKpi.Index,
 		"timeGroup":  goldKpi.StartTime,
 	}
+	// insert into new kpi_report_xxx table
+	kpiData := new(KpiData)
+	kpiData.Date = goldKpi.Date
+	kpiData.Index = goldKpi.Index
+	st, _ := time.ParseInLocation(time.RFC3339Nano, kpiReport.Task.Period.StartTime, time.Local)
+	et, _ := time.ParseInLocation(time.RFC3339Nano, kpiReport.Task.Period.EndTime, time.Local)
+	// kpiData.StartTime = goldKpi.StartTime
+	// kpiData.EndTime = goldKpi.EndTime
+	kpiData.StartTime = st
+	kpiData.EndTime = et
+	kpiData.Granularity = goldKpi.Granularity
+	kpiData.NEName = goldKpi.NEName
+	kpiData.NEType = goldKpi.NEType
+	kpiData.RmUid = goldKpi.RmUid
+	kpiVal := new(KPIVal)
+	kpiData.CreatedAt = time.Now().UnixMilli()
 	for _, k := range kpiReport.Task.NE.KPIs {
 		kpiEvent[k.KPIID] = k.Value // kip_id
 		goldKpi.KpiId = k.KPIID
 		goldKpi.Value = k.Value
 		goldKpi.Error = k.Err
-		log.Trace("goldKpi:", goldKpi)
+
+		kpiVal.KPIID = k.KPIID
+		kpiVal.Value = int64(k.Value)
+		kpiVal.Err = k.Err
+		kpiData.KPIValues = append(kpiData.KPIValues, *kpiVal)
+
+		//log.Trace("goldKpi:", goldKpi)
 
 		// 启动事务
 		err := session.Begin()
@@ -242,10 +301,22 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	// insert kpi_report table, no session
+	tableName := "kpi_report_" + strings.ToLower(kpiReport.Task.NE.NeType)
+	affected, err := xEngine.Table(tableName).Insert(kpiData)
+	if err != nil && affected <= 0 {
+		log.Errorf("Failed to insert %s:%v", tableName, err)
+		services.ResponseInternalServerError500ProcessError(w, err)
+		return
+	}
+
 	// 推送到ws订阅组
 	wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI, kpiEvent)
+	if goldKpi.NEType == "UPF" {
+		wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI_UPF, kpiEvent)
+	}
 
-	services.ResponseStatusOK200Null(w)
+	services.ResponseStatusOK204NoContent(w)
 }
 
 type MeasureTask struct {
@@ -409,11 +480,11 @@ func PostMeasureReportFromNF(w http.ResponseWriter, r *http.Request) {
 func PostMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("PostMeasureTaskToNF processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
@@ -585,11 +656,11 @@ func PutMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
 func DeleteMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DeleteMeasureTaskToNF processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
@@ -716,11 +787,11 @@ func DeleteMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
 func PatchMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("PatchMeasureTaskToNF processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	neType := vars["elementTypeValue"]
@@ -912,11 +983,11 @@ func PostMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
 func GetMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("GetMeasurementFromNF processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 
 	vars := mux.Vars(r)
 	apiVer := vars["apiVersion"]
@@ -944,7 +1015,7 @@ func GetMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
 	//var neInfo *dborm.NeInfo
 	neInfo := new(dborm.NeInfo)
 
-	neInfo, err = dborm.XormGetNeInfo(neType, neIds[0])
+	neInfo, err := dborm.XormGetNeInfo(neType, neIds[0])
 	if err != nil {
 		log.Error("dborm.XormGetNeInfo is failed:", err)
 		services.ResponseInternalServerError500DatabaseOperationFailed(w)

features/security/account.go

@@ -150,11 +150,11 @@ func LoginFromOMC(w http.ResponseWriter, r *http.Request) {
 func LogoutFromOMC(w http.ResponseWriter, r *http.Request) {
 	log.Info("LogoutFromOMC processing... ")
 
-	token, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
+	// token, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
 	// // check media type(content type) only support "application/json"
 	// if services.IsVallidContentType(r, config.GetYamlConfig().OMC.CheckContentType) == false {
 	// 	log.Error("Invalid Content-Type")
@@ -178,14 +178,14 @@ func LogoutFromOMC(w http.ResponseWriter, r *http.Request) {
 	// 	return
 	// }
 
-	se, err := dborm.XormLogoutUpdateSession(token)
-	if err != nil {
-		log.Error("Uri is invalid")
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
+	// se, err := dborm.XormLogoutUpdateSession(token)
+	// if err != nil {
+	// 	log.Error("Uri is invalid")
+	// 	services.ResponseNotFound404UriNotExist(w, r)
+	// 	return
+	// }
 	// 清除缓存用户信息
-	account.ClearLoginUser(se.AccountId)
+	// account.ClearLoginUser(se.AccountId)
 	services.ResponseStatusOK200Null(w)
 }
 

features/sm/backup.go

@@ -29,11 +29,11 @@ type OMCLocalTime struct {
 func GetOMCLocalTime(w http.ResponseWriter, r *http.Request) {
 	log.Debug("GetOMCLocalTime processing... ")
 
-	_, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Http request error:", err)
-		return
-	}
+	// _, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Http request error:", err)
+	// 	return
+	// }
 
 	t := time.Now()
 	_, offset := t.Zone()

features/state/getstate.go

@@ -192,12 +192,12 @@ func GetOneLicenseInfoFromNF(w http.ResponseWriter, r *http.Request) {
 		services.ResponseNotFound404UriNotExist(w, r)
 		return
 	}
-	token, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-	log.Debug("AccessToken:", token)
+	// token, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
+	// log.Debug("AccessToken:", token)
 
 	neInfo, err := dborm.XormGetNeInfo(neType, neId)
 	if err != nil {
@@ -247,7 +247,7 @@ func GetOneLicenseInfoFromNF(w http.ResponseWriter, r *http.Request) {
 		resp, err := client.R().
 			EnableTrace().
 			SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
-			SetHeaders(map[string]string{"accessToken": token}).
+			// SetHeaders(map[string]string{"accessToken": token}).
 			SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
 			SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
 			Get(requestURI2NF)
@@ -310,15 +310,15 @@ func GetAllLicenseInfoFromNF(w http.ResponseWriter, r *http.Request) {
 
 	data := make([]map[string]interface{}, 0)
 
-	token, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-	log.Debug("AccessToken:", token)
+	// token, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
+	// log.Debug("AccessToken:", token)
 
 	var neList []dborm.NeInfo
-	_, err = dborm.XormGetAllNeInfo(&neList)
+	_, err := dborm.XormGetAllNeInfo(&neList)
 	if err != nil {
 		log.Error("Failed to XormGetAllNeInfo:", err)
 		services.ResponseInternalServerError500ProcessError(w, err)
@@ -363,7 +363,7 @@ func GetAllLicenseInfoFromNF(w http.ResponseWriter, r *http.Request) {
 			resp, err := client.SetTimeout(time.Duration(1 * time.Second)).R().
 				EnableTrace().
 				SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
-				SetHeaders(map[string]string{"accessToken": token}).
+				// SetHeaders(map[string]string{"accessToken": token}).
 				SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
 				SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
 				Get(requestURI2NF)
@@ -434,12 +434,12 @@ func GetOneSysinfoFromNF(w http.ResponseWriter, r *http.Request) {
 		services.ResponseNotFound404UriNotExist(w, r)
 		return
 	}
-	token, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-	log.Debug("AccessToken:", token)
+	// token, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
+	// log.Debug("AccessToken:", token)
 
 	neInfo, err := dborm.XormGetNeInfo(neType, neId)
 	if err != nil {
@@ -489,7 +489,7 @@ func GetOneSysinfoFromNF(w http.ResponseWriter, r *http.Request) {
 		resp, err := client.R().
 			EnableTrace().
 			SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
-			SetHeaders(map[string]string{"accessToken": token}).
+			// SetHeaders(map[string]string{"accessToken": token}).
 			SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
 			SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
 			Get(requestURI2NF)
@@ -581,15 +581,15 @@ func GetAllSysinfoFromNF(w http.ResponseWriter, r *http.Request) {
 
 	data := make([]map[string]interface{}, 0)
 
-	token, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-	log.Debug("AccessToken:", token)
+	// token, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
+	// log.Debug("AccessToken:", token)
 
 	var neList []dborm.NeInfo
-	_, err = dborm.XormGetAllNeInfo(&neList)
+	_, err := dborm.XormGetAllNeInfo(&neList)
 	if err != nil {
 		log.Error("Failed to XormGetAllNeInfo:", err)
 		services.ResponseInternalServerError500ProcessError(w, err)
@@ -634,7 +634,7 @@ func GetAllSysinfoFromNF(w http.ResponseWriter, r *http.Request) {
 			resp, err := client.SetTimeout(time.Duration(1 * time.Second)).R().
 				EnableTrace().
 				SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
-				SetHeaders(map[string]string{"accessToken": token}).
+				// SetHeaders(map[string]string{"accessToken": token}).
 				SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
 				SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
 				Get(requestURI2NF)
@@ -846,18 +846,19 @@ func GetStateFromNFOld(w http.ResponseWriter, r *http.Request) {
 		services.ResponseNotFound404UriNotExist(w, r)
 		return
 	}
-	token, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-	log.Debug("AccessToken:", token)
+	// token, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
+	// log.Debug("AccessToken:", token)
 
 	switch strings.ToLower(neType) {
 	case "all":
 		// query all NFs
 		// create rest client
-		restHostPort := fmt.Sprintf("http://127.0.0.1:%d", config.GetYamlConfig().Rest[0].Port)
+
+		restHostPort := config.GetOMCHostUrl()
 		getNeInfoPattern := fmt.Sprintf(config.DefaultUriPrefix+"/databaseManagement/v1/elementType/%s/objectType/ne_info",
 			config.GetYamlConfig().Database.Name)
 		getNeInfoURI := restHostPort + getNeInfoPattern + "?WHERE=status+in+('0','3')"
@@ -866,7 +867,7 @@ func GetStateFromNFOld(w http.ResponseWriter, r *http.Request) {
 		resp, err := client.R().
 			EnableTrace().
 			SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
-			SetHeaders(map[string]string{"AccessToken": token}).
+			// SetHeaders(map[string]string{"AccessToken": token}).
 			SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
 			SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
 			Get(getNeInfoURI)
@@ -878,7 +879,7 @@ func GetStateFromNFOld(w http.ResponseWriter, r *http.Request) {
 
 		neList, _ = dborm.XormParseResult(resp.Body())
 	default:
-		restHostPort := fmt.Sprintf("http://127.0.0.1:%d", config.GetYamlConfig().Rest[0].Port)
+		restHostPort := config.GetOMCHostUrl()
 		getNeInfoPattern := fmt.Sprintf(config.DefaultUriPrefix+"/databaseManagement/v1/elementType/%s/objectType/ne_info",
 			config.GetYamlConfig().Database.Name)
 		getNeInfoURI := restHostPort + getNeInfoPattern
@@ -893,7 +894,7 @@ func GetStateFromNFOld(w http.ResponseWriter, r *http.Request) {
 		resp, err := client.R().
 			EnableTrace().
 			SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
-			SetHeaders(map[string]string{"accessToken": token}).
+			// SetHeaders(map[string]string{"accessToken": token}).
 			SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
 			SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
 			Get(getNeInfoURI)
@@ -924,7 +925,7 @@ func GetStateFromNFOld(w http.ResponseWriter, r *http.Request) {
 			resp, err := client.R().
 				EnableTrace().
 				SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
-				SetHeaders(map[string]string{"accessToken": token}).
+				// SetHeaders(map[string]string{"accessToken": token}).
 				SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
 				SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
 				Get(requestURI2NF)

features/trace/trace.go

@@ -67,12 +67,12 @@ func PostTraceTaskToNF(w http.ResponseWriter, r *http.Request) {
 
 	//vars := mux.Vars(r)
 
-	token, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-	log.Debug("AccessToken:", token)
+	// token, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
+	// log.Debug("AccessToken:", token)
 
 	body, err := io.ReadAll(io.LimitReader(r.Body, int64(config.GetYamlConfig().Params.UriMaxLen)))
 	if err != nil {
@@ -194,12 +194,12 @@ func PutTraceTaskToNF(w http.ResponseWriter, r *http.Request) {
 
 	//vars := mux.Vars(r)
 
-	token, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-	log.Debug("AccessToken:", token)
+	// token, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
+	// log.Debug("AccessToken:", token)
 
 	body, err := io.ReadAll(io.LimitReader(r.Body, int64(config.GetYamlConfig().Params.UriMaxLen)))
 	if err != nil {
@@ -311,17 +311,17 @@ func PutTraceTaskToNF(w http.ResponseWriter, r *http.Request) {
 func DeleteTraceTaskToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DeleteTraceTaskToNF processing... ")
 
-	token, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-	log.Debug("AccessToken:", token)
+	// token, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
+	// log.Debug("AccessToken:", token)
 
 	vars := r.URL.Query()
 	ids, ok := vars["id"]
 	if !ok || len(ids) == 0 {
-		err = global.ErrTraceNotCarriedTaskID
+		err := global.ErrTraceNotCarriedTaskID
 		log.Error(err)
 		services.ResponseInternalServerError500ProcessError(w, err)
 		return
@@ -332,7 +332,7 @@ func DeleteTraceTaskToNF(w http.ResponseWriter, r *http.Request) {
 		log.Debug("id:", id)
 
 		var succNes []string
-		err = dborm.XormGetColStringArrayByWhere("trace_task", "succ_nes", fmt.Sprintf("id=%s", id), &succNes)
+		err := dborm.XormGetColStringArrayByWhere("trace_task", "succ_nes", fmt.Sprintf("id=%s", id), &succNes)
 		if err != nil {
 			log.Error("Failed to dborm.XormGetSingleColStringArrayByWhere:", err)
 			services.ResponseInternalServerError500ProcessError(w, err)

features/ue/ue.go

@@ -46,6 +46,7 @@ type SmfUEInfo struct {
 		UpfN3IP      string `json:"upfN3IP"`
 		RanN3IP      string `json:"ranN3IP"`
 		Activetime   string `json:"activeTime"`
+		UpState      string `json:"upState"`
 	} `json:"pduSessionInfo"`
 }
 
@@ -130,12 +131,12 @@ func GetAvailableAMFsFromNSSF(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	token, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-	log.Debug("token:", token)
+	// token, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
+	// log.Debug("token:", token)
 
 	neInfo, err := dborm.XormGetNeInfo(neType, neId)
 	if err != nil {
@@ -158,7 +159,7 @@ func GetAvailableAMFsFromNSSF(w http.ResponseWriter, r *http.Request) {
 	resp, err := client.R().
 		EnableTrace().
 		SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
-		SetHeaders(map[string]string{"accessToken": token}).
+		// SetHeaders(map[string]string{"accessToken": token}).
 		SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
 		SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
 		Get(requestURI2NF)
@@ -194,12 +195,12 @@ func GetSubscriptionsFromNSSF(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	token, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-	log.Debug("token:", token)
+	// token, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
+	// log.Debug("token:", token)
 
 	neInfo, err := dborm.XormGetNeInfo(neType, neId)
 	if err != nil {
@@ -222,7 +223,7 @@ func GetSubscriptionsFromNSSF(w http.ResponseWriter, r *http.Request) {
 	resp, err := client.R().
 		EnableTrace().
 		SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
-		SetHeaders(map[string]string{"accessToken": token}).
+		// SetHeaders(map[string]string{"accessToken": token}).
 		SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
 		SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
 		Get(requestURI2NF)
@@ -258,12 +259,12 @@ func GetUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	token, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-	log.Debug("token:", token)
+	// token, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
+	// log.Debug("token:", token)
 
 	neInfo, err := dborm.XormGetNeInfo(neType, neId)
 	if err != nil {
@@ -286,7 +287,7 @@ func GetUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
 	resp, err := client.R().
 		EnableTrace().
 		SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
-		SetHeaders(map[string]string{"accessToken": token}).
+		// SetHeaders(map[string]string{"accessToken": token}).
 		SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
 		SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
 		Get(requestURI2NF)
@@ -535,12 +536,12 @@ func GetUENumFromNF(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	token, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-	log.Debug("token:", token)
+	// token, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
+	// log.Debug("token:", token)
 
 	neInfo, err := dborm.XormGetNeInfo(neType, neId)
 	if err != nil {
@@ -563,7 +564,7 @@ func GetUENumFromNF(w http.ResponseWriter, r *http.Request) {
 	resp, err := client.R().
 		EnableTrace().
 		SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
-		SetHeaders(map[string]string{"accessToken": token}).
+		// SetHeaders(map[string]string{"accessToken": token}).
 		SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
 		SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
 		Get(requestURI2NF)
@@ -599,12 +600,12 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	token, err := services.CheckFrontValidRequest(w, r)
-	if err != nil {
-		log.Error("Request error:", err)
-		return
-	}
-	log.Debug("token:", token)
+	// token, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
+	// log.Debug("token:", token)
 
 	neInfo, err := dborm.XormGetNeInfo(neType, neId)
 	if err != nil {
@@ -627,7 +628,7 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
 	resp, err := client.R().
 		EnableTrace().
 		SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
-		SetHeaders(map[string]string{"accessToken": token}).
+		// SetHeaders(map[string]string{"accessToken": token}).
 		SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
 		SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
 		Get(requestURI2NF)