fix windows \r\n bug

SummerSec · SummerSec · commit 66f104e13cea · 2022-05-20T18:17:59.000+08:00
diff --git a/cmd/commons/core/runner.go b/cmd/commons/core/runner.go
@@ -103,9 +103,10 @@ func (r *Runner) Run() {
 		//}
 
 		for t := 0; t < k; t++ {
+			j := i
 			task := func() {
-				log.Debugf(" %d %s %d", t, urls[i-1], i)
-				Start2(urls[i-1], hashmap) // Start k goroutines
+				log.Debugf("Running Submit %d url is  %s %d", t, urls[j], j)
+				Start2(urls[j], hashmap) // Start k goroutines
 				wg.Done()
 			}
 			if i == len(urls) {
diff --git a/cmd/commons/utils/readfile.go b/cmd/commons/utils/readfile.go
@@ -37,15 +37,19 @@ func ReadFile(path string) (urls []string, err error) {
 		if strings.TrimSpace(str) == "" {
 			continue
 		}
-		// 如果str结尾存在\r\n，则去掉
-		if strings.HasSuffix(str, "\r") {
-			str = strings.TrimSuffix(str, "\r\n")
-		}
 		// 如果str结尾存在\n，则去掉
 		if strings.HasSuffix(str, "\n") {
 			str = strings.TrimSuffix(str, "\n")
 		}
-		log.Debugf("The url is : ", str)
+		// 如果str结尾存在\r，则去掉
+		if strings.HasSuffix(str, "\r") {
+			str = strings.TrimSuffix(str, "\r")
+		}
+		//// 如果str结尾存在\r\n，则去掉
+		//if strings.HasSuffix(str, "\r\n") {
+		//	str = strings.TrimSuffix(str, "\r\n")
+		//}
+		log.Debugf("The url is : %s", str)
 		lins = append(lins, str)
 	}
 	return lins, nil
