修复bug

wjlin0 · Mar 27, 2023 · f623b5e · f623b5e
1 parent b21dbb2
commit f623b5e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19.3-alpine AS builder
+FROM golang:1.19.3 AS builder
 RUN go install -v github.com/wjlin0/pathScan@latest
 
 FROM alpine:3.17.1

diff --git a/config/dict.zip b/config/dict.zip
diff --git a/pkg/runner/handler.go b/pkg/runner/handler.go
@@ -129,10 +129,9 @@ func (r *Runner) handlerGetFilePath(filename string) []string {
 
 func (r *Runner) handlerGetTargets() map[string]struct{} {
 	at := make(map[string]struct{})
-
 	// 处理 Url 和 UrlFile
-	addPathsToSet(r.Cfg.Options.Url, at)
-	addPathsToSet(r.Cfg.Options.UrlFile, at)
+	r.addUrlsToSet(r.Cfg.Options.Url, at)
+	r.addUrlsToSet(r.Cfg.Options.UrlFile, at)
 
 	// 处理 UrlRemote
 	if r.Cfg.Options.UrlRemote != "" {
@@ -214,7 +213,7 @@ func (r *Runner) addUrlsToSet(urlList []string, urlSet map[string]struct{}) {
 }
 func (r *Runner) addUrlToSet(u string, urlSet map[string]struct{}) {
 	u = strings.TrimSpace(u)
-	if !strings.HasPrefix(u, "http") {
+	if !((strings.HasPrefix(u, "http") && !strings.HasSuffix(u, "https")) || (strings.HasPrefix(u, "https") && !strings.HasSuffix(u, "http"))) {
 		u1 := "http://" + u
 		u2 := "https://" + u
 		r.addUrlToSet(u1, urlSet)
@@ -225,4 +224,5 @@ func (r *Runner) addUrlToSet(u string, urlSet map[string]struct{}) {
 		}
 		urlSet[u] = struct{}{}
 	}
+
 }