Merge pull request #390 from ogero/develop

Fix generate swagger model api doc on Windows.

main.go

@@ -17,7 +17,6 @@ import (
 	"flag"
 	"log"
 	"os"
-	"strings"
 
 	"github.com/beego/bee/cmd"
 	"github.com/beego/bee/cmd/commands"
@@ -64,7 +63,7 @@ func main() {
 
 			// Check if current directory is inside the GOPATH,
 			// if so parse the packages inside it.
-			if strings.Contains(currentpath, utils.GetGOPATHs()[0]+"/src") && cmd.IfGenerateDocs(c.Name(), args) {
+			if utils.IsInGOPATH(currentpath) && cmd.IfGenerateDocs(c.Name(), args) {
 				swaggergen.ParsePackagesFromDir(currentpath)
 			}
 

utils/utils.go

@@ -61,12 +61,17 @@ func GetGOPATHs() []string {
 	return paths
 }
 
-// IsInGOPATH checks the path is in the fisrt GOPATH(/src) or not
+// IsInGOPATH checks whether the path is inside of any GOPATH or not
 func IsInGOPATH(thePath string) bool {
 	if runtime.GOOS == "windows" {
 		thePath = filepath.ToSlash(thePath)
 	}
-	return strings.Contains(thePath, GetGOPATHs()[0]+"/src")
+	for _, gopath := range GetGOPATHs() {
+		if strings.Contains(thePath, gopath + "/src") {
+			return true
+		}
+	}
+	return false
 }
 
 // IsBeegoProject checks whether the current path is a Beego application or not