Merge pull request #308 from cyberchen1995/cc-dev

chore: Modify the return type of Statis() to optimize the output style when there is no vulnerability.

Author: cyberchen1995

cmd/format/statis.go

@@ -7,7 +7,7 @@ import (
 )
 
 // Statis 统计概览信息
-func Statis(report Report) string {
+func Statis(report Report) (string, string) {
 
 	// 组件风险统计 key:0代表组件总数
 	depStatic := map[int]int{
@@ -50,10 +50,11 @@ func Statis(report Report) string {
 
 		return true
 	})
-
-	return fmt.Sprintf("Components:%d C:%d H:%d M:%d L:%d\n"+
-		"Vulnerabilities:%d C:%d H:%d M:%d L:%d",
-		depStatic[0], depStatic[1], depStatic[2], depStatic[3], depStatic[4],
-		vulStatic[0], vulStatic[1], vulStatic[2], vulStatic[3], vulStatic[4],
-	)
+	if vulStatic[0] != 0 {
+		return fmt.Sprintf("Components:%d C:%d H:%d M:%d L:%d",
+				depStatic[0], depStatic[1], depStatic[2], depStatic[3], depStatic[4]),
+			fmt.Sprintf("\nVulnerabilities:%d C:%d H:%d M:%d L:%d",
+				vulStatic[0], vulStatic[1], vulStatic[2], vulStatic[3], vulStatic[4])
+	}
+	return fmt.Sprintf("Components: %d", depStatic[0]), ""
 }

cmd/ui/ui.go

@@ -93,8 +93,9 @@ func OpenUI(report format.Report) {
 }
 
 func TaskInfo(report format.Report) *tview.TextView {
+	dep, vul := format.Statis(report)
 	info := tview.NewTextView().
-		SetText(format.Statis(report))
+		SetText(fmt.Sprintf("%s\n%s", dep, vul))
 	info.SetTextColor(tcell.ColorBlue)
 	return info
 }

main.go

@@ -88,8 +88,9 @@ func main() {
 	}
 
 	// 打印概览信息
-	fmt.Println("\n\nComplete!\n" + format.Statis(report))
-	logs.Info("\nComplete!\n" + format.Statis(report))
+	dep, vul := format.Statis(report)
+	fmt.Println("\nComplete!\n" + dep + vul)
+	logs.Info("\nComplete!\n" + dep + vul)
 
 	// 发送检测报告
 	if err := format.Saas(report); err != nil {