删除rsyslog功能,修复匹配ping时间的正则问题

alsjz · Sep 8, 2023 · 22a3ab7 · 22a3ab7
1 parent 878dabb
commit 22a3ab7
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 180 deletions.
diff --git a/cmd/network.go b/cmd/network.go
diff --git a/network/network.go b/network/network.go
diff --git a/network/syslog.go b/network/syslog.go
diff --git a/port/crack/password.txt b/port/crack/password.txt
@@ -5,6 +5,8 @@ test123456
 test12345
 test123
 test
+1234qwer!@#$
+1234qwer
 system
 sys
 sqlserver
@@ -28,6 +30,7 @@ password
 Passw0rd
 pass
 P@ssw0rd
+1qaz2wsx#
 oracle
 mysql
 ftppass
@@ -43,7 +46,6 @@ admin@123
 admin#123
 admin
 abc123
-1qaz2wsx
 1q2w3e4r
 1q2w3e
 123qwe
@@ -151,7 +153,6 @@ w1234567
 454545
 909090
 123456y
-asdf
 78787878
 !QAZ2wsx
 zxzxzx

diff --git a/port/exclude.go b/port/exclude.go
@@ -44,12 +44,7 @@ func removeDuplicates(slice []string) []string {
 
 // removeIP 获取不进行扫描的IP
 func removeIP(data string) {
-	if data == "" {
-		return
-	}
-
 	var NoList []string
-
 	if global.PathExists(data) {
 		fireData, _ := os.ReadFile(data)
 		fireData = []byte(strings.ReplaceAll(string(fireData), "\r\n", "\n"))

diff --git a/port/ping.go b/port/ping.go
@@ -116,7 +116,7 @@ func NetWorkPing(ip string) (bool, string, string) {
 	outttl := strings.ToLower(string(output)) //所有大写转换为小写
 
 	// time
-	re := regexp.MustCompile(`=(\d+)ms`)
+	re := regexp.MustCompile(`(\d+)ms`)
 	timems := ""
 	timeStr := re.FindStringSubmatch(outttl)
 	if len(timeStr) > 1 {