Merge branch 'main' of git.zcorp.cc:pangu/zentaoatf

internal/pkg/consts/consts.go

@@ -11,9 +11,8 @@ const (
 	Ip   = "127.0.0.1"
 	Port = 8085
 
-	LevelToScanScriptFile = 8
-	JobTimeoutTime        = 60 * 30
-	JobRetryTime          = 3
+	JobTimeoutTime = 60 * 30
+	JobRetryTime   = 3
 
 	ConfigVersion      = "3.0"
 	ConfigDir          = "conf"
@@ -32,6 +31,8 @@ const (
 
 	ExpectResultPass = "pass"
 
+	LevelToScanScriptFile = 8
+
 	PathInfo = "PATH_INFO"
 	Get      = "GET"
 	PthSep   = string(os.PathSeparator)
@@ -50,4 +51,7 @@ var (
 		JUnit.String(), TestNG.String(), PHPUnit.String(), PyTest.String(), Jest.String(), CppUnit.String(), GTest.String(), QTest.String(),
 		RobotFramework.String(), Cypress.String(), Playwright.String(), Puppeteer.String(), K6.String(), Zap.String(),
 	}
+
+	DirToIgnore = []string{"node_modules", ".webpack",
+		"bin", "logs", "xdoc", "log", "log-bak", "conf"}
 )

pkg/lib/common/utils.go

@@ -117,12 +117,10 @@ func IsDisable(enable string) bool {
 func IgnoreZtfFile(path string) bool {
 	path = filepath.Base(path)
 
-	arr := []string{"bin", "logs", "xdoc",
-		"log", "log-bak", "conf"}
-	if strings.Index(path, ".") == 0 ||
-		stringUtils.FindInArr(path, arr) ||
+	if strings.Index(path, ".") == 0 || stringUtils.FindInArr(path, commConsts.DirToIgnore) ||
 		(len(path) >= 4 && path[len(path)-4:] == ".exp") {
 		return true
+
 	} else {
 		return false
 	}