refactor: 输出格式重构，去掉所有插件的多线程，因为多线程会导致结果不准确，加入进度条

Common/Config.go

@@ -1,5 +1,10 @@
 package Common
 
+import (
+	"github.com/schollz/progressbar/v3"
+	"sync"
+)
+
 var version = "2.0.0"
 var Userdict = map[string][]string{
 	"ftp":        {"ftp", "admin", "www", "web", "root", "db", "wwwroot", "data"},
@@ -29,7 +34,12 @@ var Userdict = map[string][]string{
 var Passwords = []string{"123456", "admin", "admin123", "root", "", "pass123", "pass@123", "password", "Password", "P@ssword123", "123123", "654321", "111111", "123", "1", "admin@123", "Admin@123", "admin123!@#", "{user}", "{user}1", "{user}111", "{user}123", "{user}@123", "{user}_123", "{user}#123", "{user}@111", "{user}@2019", "{user}@123#4", "P@ssw0rd!", "P@ssw0rd", "Passw0rd", "qwe123", "12345678", "test", "test123", "123qwe", "123qwe!@#", "123456789", "123321", "666666", "a123456.", "123456~a", "123456!a", "000000", "1234567890", "8888888", "!QAZ2wsx", "1qaz2wsx", "abc123", "abc123456", "1qaz@WSX", "a11111", "a12345", "Aa1234", "Aa1234.", "Aa12345", "a123456", "a123123", "Aa123123", "Aa123456", "Aa12345.", "sysadmin", "system", "1qaz!QAZ", "2wsx@WSX", "qwe123!@#", "Aa123456!", "A123456s!", "sa123456", "1q2w3e", "Charge123", "Aa123456789", "elastic123"}
 
 var Outputfile = "result.txt"
-var IsSave = true
+
+// 添加一个全局的进度条变量
+var ProgressBar *progressbar.ProgressBar
+
+// 添加一个全局互斥锁来控制输出
+var OutputMutex sync.Mutex
 
 type PocInfo struct {
 	Target  string

Common/Flag.go

@@ -113,7 +113,6 @@ func Flag(Info *HostInfo) {
 
 	// 暴力破解配置
 	flag.BoolVar(&DisableBrute, "nobr", false, "禁用密码暴力破解")
-	flag.IntVar(&BruteThreads, "br", 1, "设置密码破解线程数")
 	flag.IntVar(&MaxRetries, "retry", 3, "设置最大重试次数")
 
 	// 其他配置
@@ -128,7 +127,7 @@ func Flag(Info *HostInfo) {
 	flag.BoolVar(&Silent, "silent", false, "启用静默扫描模式(减少屏幕输出)")
 	flag.BoolVar(&NoColor, "nocolor", false, "禁用彩色输出显示")
 	flag.BoolVar(&JsonFormat, "json", false, "以JSON格式输出结果")
-	flag.StringVar(&LogLevel, "log", LogLevelAll, "日志输出级别(ALL/SUCCESS/ERROR/INFO/DEBUG)")
+	flag.StringVar(&LogLevel, "log", LogLevelInfo, "日志输出级别(ALL/SUCCESS/ERROR/INFO/DEBUG)")
 
 	flag.Parse()
 }

Common/Log.go

@@ -18,19 +18,14 @@ import (
 
 var (
 	// 全局变量
-	status  = &ScanStatus{lastSuccess: time.Now(), lastError: time.Now()}
-	results = make(chan *LogEntry, 1000) // 使用缓冲通道
-	logWG   sync.WaitGroup
+	status = &ScanStatus{lastSuccess: time.Now(), lastError: time.Now()}
 
 	// 扫描计数
 	Num int64 // 总任务数
 	End int64 // 已完成任务数
-)
 
-// 将 results 改名为 Results 使其可导出
-var (
-	Results = results // 使 results 可导出
-	LogWG   = logWG   // 使 logWG 可导出
+	// 文件写入器
+	fileWriter *bufferedFileWriter
 )
 
 // ScanStatus 记录扫描状态
@@ -66,16 +61,18 @@ var logColors = map[string]color.Attribute{
 	LogLevelDebug:   color.FgBlue,
 }
 
-// bufferedFileWriter 文件写入器
-type bufferedFileWriter struct {
-	file    *os.File
-	writer  *bufio.Writer
-	jsonEnc *json.Encoder
+// JsonOutput JSON输出的结构体
+type JsonOutput struct {
+	Level     string    `json:"level"`
+	Timestamp time.Time `json:"timestamp"`
+	Message   string    `json:"message"`
 }
 
-func init() {
+func InitLogger() {
 	log.SetOutput(io.Discard)
-	go processLogs()
+	if !DisableSave {
+		fileWriter = newBufferedFileWriter()
+	}
 }
 
 // formatLogMessage 格式化日志消息
@@ -85,124 +82,108 @@ func formatLogMessage(entry *LogEntry) string {
 }
 
 func printLog(entry *LogEntry) {
-	// 根据配置的日志级别过滤
-	if LogLevel != LogLevelAll && entry.Level != LogLevel {
+	// 先检查日志级别
+	if LogLevel != LogLevelAll &&
+		entry.Level != LogLevel &&
+		!(LogLevel == LogLevelInfo && (entry.Level == LogLevelInfo || entry.Level == LogLevelSuccess)) {
 		return
 	}
 
+	OutputMutex.Lock()
+	defer OutputMutex.Unlock()
+
 	logMsg := formatLogMessage(entry)
-	if NoColor {
-		fmt.Println(logMsg)
-		return
-	}
-
-	if colorAttr, ok := logColors[entry.Level]; ok {
-		color.New(colorAttr).Println(logMsg)
+	// 只在输出到终端时处理进度条
+	if !NoColor {
+		// 清除当前行
+		fmt.Print("\033[2K\r")
+		if colorAttr, ok := logColors[entry.Level]; ok {
+			color.New(colorAttr).Println(logMsg)
+		} else {
+			fmt.Println(logMsg)
+		}
 	} else {
 		fmt.Println(logMsg)
 	}
 }
 
-// 同样修改 LogError 和 LogInfo
 func LogError(errMsg string) {
-	// 获取调用者信息
 	_, file, line, ok := runtime.Caller(1)
 	if !ok {
 		file = "unknown"
 		line = 0
 	}
-	// 只获取文件名
 	file = filepath.Base(file)
 
-	// 格式化错误消息
 	errorMsg := fmt.Sprintf("%s:%d - %s", file, line, errMsg)
 
-	select {
-	case Results <- &LogEntry{
+	if ProgressBar != nil {
+		ProgressBar.Clear()
+	}
+
+	entry := &LogEntry{
 		Level:   LogLevelError,
 		Time:    time.Now(),
 		Content: errorMsg,
-	}:
-		logWG.Add(1)
-	default:
-		printLog(&LogEntry{
-			Level:   LogLevelError,
-			Time:    time.Now(),
-			Content: errorMsg,
-		})
+	}
+
+	printLog(entry)
+	if fileWriter != nil {
+		fileWriter.write(entry)
+	}
+
+	if ProgressBar != nil {
+		ProgressBar.RenderBlank()
 	}
 }
 
 func LogInfo(msg string) {
-	select {
-	case Results <- &LogEntry{
+	if ProgressBar != nil {
+		ProgressBar.Clear()
+	}
+
+	entry := &LogEntry{
 		Level:   LogLevelInfo,
 		Time:    time.Now(),
 		Content: msg,
-	}:
-		logWG.Add(1)
-	default:
-		printLog(&LogEntry{
-			Level:   LogLevelInfo,
-			Time:    time.Now(),
-			Content: msg,
-		})
+	}
+
+	printLog(entry)
+	if fileWriter != nil {
+		fileWriter.write(entry)
+	}
+
+	if ProgressBar != nil {
+		ProgressBar.RenderBlank()
 	}
 }
 
-// LogSuccess 记录成功信息
 func LogSuccess(result string) {
-	// 添加通道关闭检查
-	select {
-	case Results <- &LogEntry{
+	if ProgressBar != nil {
+		ProgressBar.Clear()
+	}
+
+	entry := &LogEntry{
 		Level:   LogLevelSuccess,
 		Time:    time.Now(),
 		Content: result,
-	}:
-		logWG.Add(1)
-		status.mu.Lock()
-		status.lastSuccess = time.Now()
-		status.mu.Unlock()
-	default:
-		// 如果通道已关闭或已满，直接打印
-		printLog(&LogEntry{
-			Level:   LogLevelSuccess,
-			Time:    time.Now(),
-			Content: result,
-		})
 	}
-}
 
-// JsonOutput JSON输出的结构体
-type JsonOutput struct {
-	Level     string    `json:"level"`
-	Timestamp time.Time `json:"timestamp"`
-	Message   string    `json:"message"`
-}
+	printLog(entry)
+	if fileWriter != nil {
+		fileWriter.write(entry)
+	}
 
-// processLogs 处理日志信息
-func processLogs() {
-	writer := newBufferedFileWriter()
-	defer writer.close()
+	status.mu.Lock()
+	status.lastSuccess = time.Now()
+	status.mu.Unlock()
 
-	for entry := range results {
-		if !Silent {
-			printLog(entry)
-		}
-
-		if writer != nil {
-			writer.write(entry)
-		}
-
-		logWG.Done()
+	if ProgressBar != nil {
+		ProgressBar.RenderBlank()
 	}
 }
 
 func newBufferedFileWriter() *bufferedFileWriter {
-	if DisableSave {
-		return nil
-	}
-
 	file, err := os.OpenFile(Outputfile, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
 	if err != nil {
 		fmt.Printf("[ERROR] 打开输出文件失败 %s: %v\n", Outputfile, err)
@@ -217,28 +198,67 @@ func newBufferedFileWriter() *bufferedFileWriter {
 	}
 }
 
+type bufferedFileWriter struct {
+	file    *os.File
+	writer  *bufio.Writer
+	jsonEnc *json.Encoder
+	mu      sync.Mutex // 添加互斥锁保护写入
+}
+
 func (w *bufferedFileWriter) write(entry *LogEntry) {
 	if w == nil {
 		return
 	}
 
+	w.mu.Lock()
+	defer w.mu.Unlock()
+
+	var err error
 	if JsonFormat {
 		output := JsonOutput{
 			Level:     entry.Level,
 			Timestamp: entry.Time,
 			Message:   entry.Content,
 		}
-		if err := w.jsonEnc.Encode(output); err != nil {
-			fmt.Printf("[ERROR] JSON编码失败: %v\n", err)
-		}
+		err = w.jsonEnc.Encode(output)
 	} else {
 		logMsg := formatLogMessage(entry) + "\n"
-		if _, err := w.writer.WriteString(logMsg); err != nil {
-			fmt.Printf("[ERROR] 写入文件失败: %v\n", err)
-		}
+		_, err = w.writer.WriteString(logMsg)
 	}
 
-	w.writer.Flush()
+	if err != nil {
+		fmt.Printf("[ERROR] 写入日志失败: %v\n", err)
+		// 尝试重新打开文件
+		if err := w.reopen(); err != nil {
+			fmt.Printf("[ERROR] 重新打开文件失败: %v\n", err)
+			return
+		}
+		return
+	}
+
+	// 每隔一定数量的写入才进行一次Flush
+	if err := w.writer.Flush(); err != nil {
+		fmt.Printf("[ERROR] 刷新缓冲区失败: %v\n", err)
+		if err := w.reopen(); err != nil {
+			fmt.Printf("[ERROR] 重新打开文件失败: %v\n", err)
+		}
+	}
+}
+
+func (w *bufferedFileWriter) reopen() error {
+	if w.file != nil {
+		w.file.Close()
+	}
+
+	file, err := os.OpenFile(Outputfile, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
+	if err != nil {
+		return err
+	}
+
+	w.file = file
+	w.writer = bufio.NewWriter(file)
+	w.jsonEnc = json.NewEncoder(w.writer)
+	return nil
 }
 
 func (w *bufferedFileWriter) close() {
@@ -248,6 +268,12 @@ func (w *bufferedFileWriter) close() {
 	}
 }
 
+func CloseLogger() {
+	if fileWriter != nil {
+		fileWriter.close()
+	}
+}
+
 // CheckErrs 检查是否为需要重试的错误
 func CheckErrs(err error) error {
 	if err == nil {

Common/Parse.go

@@ -223,10 +223,10 @@ func ParseInput(Info *HostInfo) error {
 		LogInfo(fmt.Sprintf("暴力破解线程数: %d", BruteThreads))
 	}
 
-	if DisableSave {
-		IsSave = false
-		LogInfo("已启用临时保存模式")
-	}
+	//if DisableSave {
+	//	IsSave = false
+	//	LogInfo("已启用临时保存模式")
+	//}
 
 	// 处理端口配置
 	if Ports == MainPorts {

Common/ParseScanMode.go

@@ -21,7 +21,7 @@ var pluginGroups = map[string][]string{
 		"web", "fcgi", // web类
 		"mysql", "mssql", "redis", "mongodb", "postgres", // 数据库类
 		"oracle", "memcached", "elasticsearch", "rabbitmq", "kafka", "activemq", "cassandra", "neo4j", // 数据库类
-		"ftp", "ssh", "telnet", "smb", "rdp", "vnc", "netbios", "ldap", "smtp", "imap", "pop3", "snmp", "zabbix", "modbus", "rsync", // 服务类
+		"ftp", "ssh", "telnet", "smb", "rdp", "vnc", "netbios", "ldap", "smtp", "imap", "pop3", "snmp", "modbus", "rsync", // 服务类
 		"ms17010", "smbghost", "smb2", // 漏洞类
 		"findnet", // 其他
 	},
@@ -36,7 +36,7 @@ var pluginGroups = map[string][]string{
 		"web", "fcgi",
 	},
 	ModeService: {
-		"ftp", "ssh", "telnet", "smb", "rdp", "vnc", "netbios", "ldap", "smtp", "imap", "pop3", "zabbix", "modbus", "rsync",
+		"ftp", "ssh", "telnet", "smb", "rdp", "vnc", "netbios", "ldap", "smtp", "imap", "pop3", "modbus", "rsync",
 	},
 	ModeVul: {
 		"ms17010", "smbghost", "smb2",