feature(1.2.8): 调整 internal 目录结构

Author: xinliangnote

assets/templates/generator/generator_handler.html

@@ -16,7 +16,7 @@
         <header class="card-header"><div class="card-title"> 生成控制器方法 </div></header>
         <div class="card-body">
           <div class="form-group">
-            <label for="handlerName">handler 名称，例如：<code>user_handler</code></label>
+            <label for="handlerName">API handler 名称，例如：<code>user</code>，<small>user 为 internal/api 目录下的文件夹名称</small></label>
             <input type="text" class="form-control" id="handlerName" placeholder="请输入 handler 名称">
           </div>
 

cmd/gormgen/pkg/template.go

@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo"
+	"github.com/xinliangnote/go-gin-api/internal/repository/mysql"
 
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
@@ -135,7 +135,7 @@ func (qb *{{.QueryBuilderName}}) Offset(offset int) *{{.QueryBuilderName}} {
 
 {{$queryBuilderName := .QueryBuilderName}}
 {{range .OptionFields}}
-func (qb *{{$queryBuilderName}}) Where{{call $.Helpers.Titelize .FieldName}}(p db_repo.Predicate, value {{.FieldType}}) *{{$queryBuilderName}} {
+func (qb *{{$queryBuilderName}}) Where{{call $.Helpers.Titelize .FieldName}}(p mysql.Predicate, value {{.FieldType}}) *{{$queryBuilderName}} {
 	 qb.where = append(qb.where, struct {
 		prefix string
 		value interface{}

cmd/handlergen/README.md

@@ -25,7 +25,7 @@ func init() {
 
 func main() {
 	fs := token.NewFileSet()
-	filePath := fmt.Sprintf("./internal/api/controller/%s", handlerName)
+	filePath := fmt.Sprintf("./internal/api/%s", handlerName)
 	parsedFile, err := decorator.ParseFile(fs, filePath+"/handler.go", nil, 0)
 	if err != nil {
 		log.Fatalf("parsing package: %s: %s\n", filePath, err)
@@ -59,7 +59,7 @@ func main() {
 						continue
 					}
 
-					filepath := "./internal/api/controller/" + handlerName
+					filepath := "./internal/api/" + handlerName
 					filename := fmt.Sprintf("%s/func_%s.go", filepath, strings.ToLower(v.Names[0].String()))
 					funcFile, err := os.OpenFile(filename, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0766)
 					if err != nil {
@@ -89,7 +89,7 @@ func main() {
 					funcContent += fmt.Sprintf("// @Description%s \n", nameArr[1])
 					// Tags
 					funcContent += fmt.Sprintf("%s \n", v.Decorations().Start.All()[1])
-					funcContent += fmt.Sprintf("// @Accept json \n")
+					funcContent += fmt.Sprintf("// @Accept multipart/form-data \n")
 					funcContent += fmt.Sprintf("// @Produce json \n")
 					funcContent += fmt.Sprintf("// @Param Request body %sRequest true \"请求信息\" \n", Lcfirst(v.Names[0].String()))
 					funcContent += fmt.Sprintf("// @Success 200 {object} %sResponse \n", Lcfirst(v.Names[0].String()))

cmd/handlergen/main.go

@@ -75,7 +75,7 @@ func main() {
 
 	for _, table := range tables {
 
-		filepath := "./internal/api/repository/db_repo/" + table.Name + "_repo"
+		filepath := "./internal/repository/mysql/" + table.Name
 		_ = os.Mkdir(filepath, 0766)
 		fmt.Println("create dir : ", filepath)
 
@@ -85,17 +85,17 @@ func main() {
 			fmt.Printf("markdown file error %v\n", err.Error())
 			return
 		}
-		fmt.Println("  └── file : ", table.Name+"_repo/gen_table.md")
+		fmt.Println("  └── file : ", table.Name+"/gen_table.md")
 
 		modelName := fmt.Sprintf("%s/gen_model.go", filepath)
 		modelFile, err := os.OpenFile(modelName, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0766)
 		if err != nil {
 			fmt.Printf("create and open model file error %v\n", err.Error())
 			return
 		}
-		fmt.Println("  └── file : ", table.Name+"_repo/gen_model.go")
+		fmt.Println("  └── file : ", table.Name+"/gen_model.go")
 
-		modelContent := fmt.Sprintf("package %s%s\n", table.Name, "_repo")
+		modelContent := fmt.Sprintf("package %s\n", table.Name)
 		modelContent += fmt.Sprintf(`import "time"`)
 		modelContent += fmt.Sprintf("\n\n// %s %s \n", capitalize(table.Name), table.Comment.String)
 		modelContent += fmt.Sprintf("//go:generate gormgen -structs %s -input . \n", capitalize(table.Name))