fixed:Issue #[4] by [GrantZheng]: [new service with the name as first…

… letter capital or Camel].
GrantZheng · May 25, 2020 · a85f301 · a85f301
1 parent 94a4659
commit a85f301
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/generator/generate_service.go b/generator/generate_service.go
@@ -2202,15 +2202,15 @@ func (g *generateCmd) generateCancelInterrupt() {
 	}
 }
 func (g *generateCmd) generateCmdMain() error {
-	mainDest := fmt.Sprintf(viper.GetString("gk_cmd_path_format"), g.name)
+	mainDest := fmt.Sprintf(viper.GetString("gk_cmd_path_format"), utils.ToLowerSnakeCase(g.name))
 	mainFilePath := path.Join(mainDest, "main.go")
 	g.CreateFolderStructure(mainDest)
 	if b, err := g.fs.Exists(mainFilePath); err != nil {
 		return err
 	} else if b {
 		return nil
 	}
-	cmdSvcImport, err := utils.GetCmdServiceImportPath(g.name)
+	cmdSvcImport, err := utils.GetCmdServiceImportPath(utils.ToLowerSnakeCase(g.name))
 	if err != nil {
 		return err
 	}

diff --git a/generator/new_service.go b/generator/new_service.go
@@ -62,16 +62,20 @@ func (g *NewService) Generate() error {
 }
 
 func (g *NewService) genModule() error {
-	exist, _ := g.fs.Exists(g.name + "/go.mod")
+	prjName := utils.ToLowerSnakeCase(g.name)
+	exist, _ := g.fs.Exists(prjName + "/go.mod")
 	if exist {
 		return nil
 	}
 
-	moduleName := g.name
+	moduleName := prjName
 	if viper.GetString("n_s_module") != "" {
 		moduleName = viper.GetString("n_s_module")
+		moduleNameSlice := strings.Split(moduleName, "/")
+		moduleNameSlice[len(moduleNameSlice) - 1] = utils.ToLowerSnakeCase(moduleNameSlice[len(moduleNameSlice) - 1])
+		moduleName = strings.Join(moduleNameSlice, "/")
 	}
-	cmdStr := "cd " + g.name + " && go mod init " + moduleName
+	cmdStr := "cd " + prjName + " && go mod init " + moduleName
 	cmd := exec.Command("sh", "-c", cmdStr)
 	_, err := cmd.Output()
 	return err

diff --git a/utils/utils.go b/utils/utils.go
@@ -171,7 +171,7 @@ func getImportPath(name string, key string) (string, error) {
 
 func getModNameFromModFile(name string) (string, error) {
 	modFile := "go.mod"
-	filePath := name + "/" + modFile
+	filePath := ToLowerSnakeCase(name) + "/" + modFile
 	exists, _ := fs.Get().Exists(filePath)
 	var modFileInParentLevel bool
 	if exists == false {