From fdb3c2fbf6233dda06f53248bf19e562ef184fb0 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Wed, 21 Feb 2024 19:10:10 +0800
Subject: [PATCH] fix:continue if error command

---
 features/mml/mml.go | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/features/mml/mml.go b/features/mml/mml.go
index 5934b664..04a7a2fe 100644
--- a/features/mml/mml.go
+++ b/features/mml/mml.go
@@ -24,6 +24,7 @@ import (
 // const (
 // 	//经过测试，linux下，延时需要大于100ms
 // 	TIME_DELAY_AFTER_WRITE = 200
+// 	TIME_DEAD_LINE         = 10
 // )
 
 type Response struct {
@@ -48,14 +49,17 @@ var (
 	CustomUriOmMmlInt = config.UriPrefix + "/omManagement/{apiVersion}/mml/{neType}/{neId}"
 )
 
-// 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)
-// 	}
-// }
+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 PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("PostMMLToNF processing... ")
@@ -66,14 +70,14 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	// 经过测试，linux下，延时需要大于100ms
-	var TIME_DELAY_AFTER_WRITE time.Duration = 200
-	var TIME_DEAD_LINE time.Duration = 10
-	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)
-	}
+	// var TIME_DELAY_AFTER_WRITE time.Duration = 200
+	// var TIME_DEAD_LINE time.Duration = 10
+	// 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)
+	// }
 
 	pack := "mml"
 	vars := mux.Vars(r)
@@ -330,7 +334,7 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) {
 				services.ResponseWithJson(w, http.StatusOK, response)
 				return
 			}
-			log.Debug(string(buf[0:n]))
+			log.Trace(string(buf[0:n]))
 
 			_, err = conn.Write([]byte(config.GetYamlConfig().MML.Password + "\r\n"))
 			if err != nil {
@@ -402,7 +406,6 @@ func PostMMLToNF(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]`)
-				// upf telnet buffer只能读取一次，需要去掉前面的多余字符
 				result := re1.ReplaceAllString(string(buf[0:n-len(neType)-2]), "")
 				result = re2.ReplaceAllString(result, "")
 				mmlResult = append(mmlResult, result)
@@ -540,7 +543,7 @@ func PostMMLToOMC(w http.ResponseWriter, r *http.Request) {
 	hostUri := fmt.Sprintf("http://%s:%s", neInfo.Ip, neInfo.Port)
 
 	omcMmlVar := &mmlp.MmlVar{
-		Version:       "16.1.1",
+		Version:       global.Version,
 		Output:        mmlp.DefaultFormatType,
 		MmlHome:       config.GetYamlConfig().MML.MmlHome,
 		Limit:         50,