fix config yaml gen (#25)

* optimized

* format

Co-authored-by: kingxt <dream4kingxt@163.com>
This commit is contained in:
kingxt
2020-08-27 15:23:19 +08:00
committed by GitHub
parent a987d12237
commit 38806e7237
4 changed files with 65 additions and 50 deletions

View File

@@ -140,20 +140,7 @@ func createGoModFileIfNeed(dir string) {
panic(err)
}
var tempPath = absDir
var hasGoMod = false
for {
if util.FileExists(filepath.Join(tempPath, goModeIdentifier)) {
hasGoMod = true
break
}
tempPath = filepath.Dir(tempPath)
if tempPath == filepath.Dir(tempPath) {
break
}
}
_, hasGoMod := util.FindGoModPath(dir)
if !hasGoMod {
gopath := os.Getenv("GOPATH")
parent := path.Join(gopath, "src")

View File

@@ -15,8 +15,6 @@ import (
goctlutil "github.com/tal-tech/go-zero/tools/goctl/util"
)
const goModeIdentifier = "go.mod"
func getParentPackage(dir string) (string, error) {
absDir, err := filepath.Abs(dir)
if err != nil {
@@ -24,27 +22,7 @@ func getParentPackage(dir string) (string, error) {
}
absDir = strings.ReplaceAll(absDir, `\`, `/`)
var rootPath string
var tempPath = absDir
var hasGoMod = false
for {
if goctlutil.FileExists(filepath.Join(tempPath, goModeIdentifier)) {
tempPath = filepath.Dir(tempPath)
rootPath = absDir[len(tempPath)+1:]
hasGoMod = true
break
}
if tempPath == filepath.Dir(tempPath) {
break
}
tempPath = filepath.Dir(tempPath)
if tempPath == string(filepath.Separator) {
break
}
}
var rootPath, hasGoMod = goctlutil.FindGoModPath(dir)
if hasGoMod {
return rootPath, nil
}
@@ -54,7 +32,7 @@ func getParentPackage(dir string) (string, error) {
pos := strings.Index(absDir, parent)
if pos < 0 {
fmt.Printf("%s not in go.mod project path, or not in GOPATH of %s directory\n", absDir, gopath)
tempPath = filepath.Dir(absDir)
var tempPath = filepath.Dir(absDir)
rootPath = absDir[len(tempPath)+1:]
} else {
rootPath = absDir[len(parent)+1:]