Merge branch 'main' of http://192.168.2.166:3180/OMC/ems_backend

features/dbrest/dbrest.go

@@ -192,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"]
@@ -253,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)
@@ -265,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 {
@@ -299,7 +299,6 @@ 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 != "" {
@@ -314,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)
@@ -336,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 {
@@ -355,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 {
@@ -400,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 := ""
@@ -412,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 {
@@ -464,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 := ""
@@ -476,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 {

features/lm/logbak.go

@@ -84,18 +84,18 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName, dbParam st
 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/mml/mml.go

@@ -186,11 +186,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 +214,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 +249,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 +630,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 +645,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 +669,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(),