feat: Support set module name in config

Author: LyricTian

Makefile

@@ -1,6 +1,6 @@
 .PHONY: build
 
-RELEASE_VERSION = v10.3.1
+RELEASE_VERSION = v10.3.3
 
 APP 			= gin-admin-cli
 BIN  			= ${APP}

cmd/generate.go

@@ -27,7 +27,7 @@ func Generate() *cli.Command {
 				Name:     "module",
 				Aliases:  []string{"m"},
 				Usage:    "The module to generate the struct from (like: RBAC)",
-				Required: true,
+				Required: false,
 			},
 			&cli.StringFlag{
 				Name:  "module-path",
@@ -87,7 +87,7 @@ func Generate() *cli.Command {
 			gen := actions.Generate(actions.GenerateConfig{
 				Dir:         c.String("dir"),
 				TplType:     c.String("tpl-type"),
-				ModuleName:  c.String("module"),
+				Module:      c.String("module"),
 				ModulePath:  c.String("module-path"),
 				WirePath:    c.String("wire-path"),
 				SwaggerPath: c.String("swag-path"),

internal/actions/generate.go

@@ -16,7 +16,7 @@ import (
 type GenerateConfig struct {
 	Dir         string
 	TplType     string
-	ModuleName  string
+	Module      string
 	ModulePath  string
 	WirePath    string
 	SwaggerPath string
@@ -29,7 +29,7 @@ func Generate(cfg GenerateConfig) *GenerateAction {
 		cfg:              &cfg,
 		fs:               tfs.Ins,
 		rootImportPath:   parser.GetRootImportPath(cfg.Dir),
-		moduleImportPath: parser.GetModuleImportPath(cfg.Dir, cfg.ModulePath, cfg.ModuleName),
+		moduleImportPath: parser.GetModuleImportPath(cfg.Dir, cfg.ModulePath, cfg.Module),
 		UtilImportPath:   parser.GetUtilImportPath(cfg.Dir, cfg.ModulePath),
 	}
 }
@@ -85,32 +85,45 @@ func (a *GenerateAction) RunWithStruct(ctx context.Context, s *schema.S) error {
 }
 
 func (a *GenerateAction) run(ctx context.Context, data []*schema.S) error {
+	moduleMap := make(map[string]bool)
+
 	for _, d := range data {
+		if d.Module == "" && a.cfg.Module == "" {
+			return fmt.Errorf("Struct %s module is empty", d.Name)
+		}
+
+		if d.Module == "" {
+			d.Module = a.cfg.Module
+		}
+		if !moduleMap[d.Module] {
+			moduleMap[d.Module] = true
+		}
 		if err := a.generate(ctx, d); err != nil {
 			return err
 		}
-
 		if d.GenerateFE {
 			if err := a.generateFE(ctx, d); err != nil {
 				return err
 			}
 		}
 	}
 
-	modsTplData, err := parser.ModifyModsFile(ctx, parser.BasicArgs{
-		Dir:        a.cfg.Dir,
-		ModuleName: a.cfg.ModuleName,
-		ModulePath: a.cfg.ModulePath,
-		Flag:       parser.AstFlagGen,
-	})
-	if err != nil {
-		a.logger.Errorf("Failed to modify mods file, err: %s", err)
-		return err
-	}
+	for module := range moduleMap {
+		modsTplData, err := parser.ModifyModsFile(ctx, parser.BasicArgs{
+			Dir:        a.cfg.Dir,
+			ModuleName: module,
+			ModulePath: a.cfg.ModulePath,
+			Flag:       parser.AstFlagGen,
+		})
+		if err != nil {
+			a.logger.Errorf("Failed to modify mods file, err: %s", err)
+			return err
+		}
 
-	err = a.write(ctx, a.cfg.ModuleName, "", parser.FileForMods, modsTplData, false)
-	if err != nil {
-		return err
+		err = a.write(ctx, module, "", parser.FileForMods, modsTplData, false)
+		if err != nil {
+			return err
+		}
 	}
 
 	return a.execWireAndSwag(ctx)
@@ -200,7 +213,6 @@ func (a *GenerateAction) write(ctx context.Context, moduleName, structName, tpl
 func (a *GenerateAction) generate(ctx context.Context, dataItem *schema.S) error {
 	dataItem = dataItem.Format()
 	dataItem.RootImportPath = a.rootImportPath
-	dataItem.ModuleName = a.cfg.ModuleName
 	dataItem.ModuleImportPath = a.moduleImportPath
 	dataItem.UtilImportPath = a.UtilImportPath
 
@@ -217,15 +229,15 @@ func (a *GenerateAction) generate(ctx context.Context, dataItem *schema.S) error
 			return err
 		}
 
-		err = a.write(ctx, dataItem.ModuleName, dataItem.Name, parser.StructPackageTplPaths[pkgName], tplData, !dataItem.ForceWrite)
+		err = a.write(ctx, dataItem.Module, dataItem.Name, parser.StructPackageTplPaths[pkgName], tplData, !dataItem.ForceWrite)
 		if err != nil {
 			return err
 		}
 	}
 
 	basicArgs := parser.BasicArgs{
 		Dir:              a.cfg.Dir,
-		ModuleName:       dataItem.ModuleName,
+		ModuleName:       dataItem.Module,
 		ModulePath:       a.cfg.ModulePath,
 		StructName:       dataItem.Name,
 		GenPackages:      genPackages,
@@ -238,7 +250,7 @@ func (a *GenerateAction) generate(ctx context.Context, dataItem *schema.S) error
 		return err
 	}
 
-	err = a.write(ctx, dataItem.ModuleName, dataItem.Name, parser.FileForModuleMain, moduleMainTplData, false)
+	err = a.write(ctx, dataItem.Module, dataItem.Name, parser.FileForModuleMain, moduleMainTplData, false)
 	if err != nil {
 		return err
 	}
@@ -249,7 +261,7 @@ func (a *GenerateAction) generate(ctx context.Context, dataItem *schema.S) error
 		return err
 	}
 
-	err = a.write(ctx, dataItem.ModuleName, dataItem.Name, parser.FileForModuleWire, moduleWireTplData, false)
+	err = a.write(ctx, dataItem.Module, dataItem.Name, parser.FileForModuleWire, moduleWireTplData, false)
 	if err != nil {
 		return err
 	}

internal/schema/struct.go

@@ -9,7 +9,6 @@ import (
 
 type S struct {
 	RootImportPath   string `yaml:"-" json:"-"`
-	ModuleName       string `yaml:"-" json:"-"`
 	ModuleImportPath string `yaml:"-" json:"-"`
 	UtilImportPath   string `yaml:"-" json:"-"`
 	Include          struct {
@@ -19,6 +18,7 @@ type S struct {
 		UpdatedAt bool
 		Sequence  bool
 	} `yaml:"-" json:"-"`
+	Module               string                 `yaml:"module,omitempty" json:"module,omitempty"`
 	Name                 string                 `yaml:"name,omitempty" json:"name,omitempty"`
 	TableName            string                 `yaml:"table_name,omitempty" json:"table_name,omitempty"`
 	Comment              string                 `yaml:"comment,omitempty" json:"comment,omitempty"`

main.go

@@ -13,7 +13,7 @@ import (
 //go:embed tpls
 var f embed.FS
 
-var VERSION = "v10.3.1"
+var VERSION = "v10.3.3"
 
 func main() {
 	defer func() {