Merge pull request TarsCloud#249 from defool/fix_tars2go_module

Support parent directory of outdir in tars2go
burncom · Oct 22, 2020 · a5349e6 · a5349e6
2 parents 755d659 78979cf
commit a5349e6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/tars/tools/tars2go/gen_go.go b/tars/tools/tars2go/gen_go.go
@@ -323,7  323,8 @@ func (gen *GenGo) genStructImport(module string, protoName string, mImports map[
 	// TarsTest/MyApp
 	var modulePath string
 	if gen.module != "" {
-		modulePath = fmt.Sprintf("%s/%s%s%s", gen.module, gen.prefix, jcePath, moduleStr)
                 mf := filepath.Clean(filepath.Join(gen.module, gen.prefix))
                 modulePath = fmt.Sprintf("%s/%s%s", mf, jcePath, moduleStr)
 	} else {
 		modulePath = fmt.Sprintf("%s%s", jcePath, moduleStr)
 	}
@@ -402,7  403,8 @@ func (gen *GenGo) genIFImport(module string, protoName string) {
 	// TarsTest/MyApp
 	var modulePath string
 	if gen.module != "" {
-		modulePath = fmt.Sprintf("%s/%s%s%s", gen.module, gen.prefix, jcePath, moduleStr)
                 mf := filepath.Clean(filepath.Join(gen.module, gen.prefix))
 		modulePath = fmt.Sprintf("%s/%s%s", mf, jcePath, moduleStr)
 	} else {
 		modulePath = fmt.Sprintf("%s%s", jcePath, moduleStr)
 	}