By default, it is compatible with previous versions, and the auto-package and package parameters are added

Author: lascyb

tools/goctl/internal/flags/default_en.json

@@ -205,6 +205,8 @@
         "cache": "Generate code with cache [optional]",
         "easy": "Generate code with auto generated CollectionName for easy declare [optional]",
         "dir": "{{.goctl.model.dir}}",
+        "auto-package": "Whether to automatically use the name of the directory where the build file is located as the package name [optional,default=false]\nIt is mainly used to be compatible with previous versions,If this parameter is set to false, the package name is set to model by default",
+        "package": "Manually specify the package name, which takes precedence over VarBoolPkgAuto [optional]",
         "style": "{{.global.style}}",
         "home": "{{.global.home}}",
         "remote": "{{.global.remote}}",

tools/goctl/model/cmd.go

@@ -63,6 +63,8 @@ func init() {
 	mongoCmdFlags.BoolVarP(&mongo.VarBoolCache, "cache", "c")
 	mongoCmdFlags.BoolVarP(&mongo.VarBoolEasy, "easy", "e")
 	mongoCmdFlags.StringVarP(&mongo.VarStringDir, "dir", "d")
+	mongoCmdFlags.BoolVarP(&mongo.VarBoolAutoPackage, "auto-package", "a")
+	mongoCmdFlags.StringVarP(&mongo.VarStringPackage, "package", "p")
 	mongoCmdFlags.StringVar(&mongo.VarStringStyle, "style")
 	mongoCmdFlags.StringVar(&mongo.VarStringHome, "home")
 	mongoCmdFlags.StringVar(&mongo.VarStringRemote, "remote")

tools/goctl/model/mongo/mongo.go

@@ -17,6 +17,12 @@ var (
 	VarStringSliceType []string
 	// VarStringDir describes an output directory.
 	VarStringDir string
+	//VarBoolAutoPackage Default false;
+	//  - Whether to automatically use the name of the directory where the build file is located as the package name
+	//  - It is mainly used to be compatible with previous versions,If this parameter is set to false, the package name is set to model by default
+	VarBoolAutoPackage bool
+	//VarStringPackage Manually specify the package name, which takes precedence over VarBoolPkgAuto
+	VarStringPackage string
 	// VarBoolCache describes whether cache is enabled.
 	VarBoolCache bool
 	// VarBoolEasy  describes whether to generate Collection Name in the code for easy declare.
@@ -66,22 +72,25 @@ func Action(_ *cobra.Command, _ []string) error {
 	if err != nil {
 		return err
 	}
-
 	if err = pathx.MkdirIfNotExist(a); err != nil {
 		return err
 	}
 
-	baseDir := filepath.Base(a)
-	if baseDir == "" || baseDir == "." {
-		baseDir = "model" // as default
+	var pkg string
+	if VarStringPackage != "" {
+		pkg = VarStringPackage
+	} else if VarBoolAutoPackage {
+		pkg = file.SafeString(filepath.Base(a))
+	} else {
+		pkg = "model"
 	}
 
 	return generate.Do(&generate.Context{
-		Types:  tp,
-		Cache:  c,
-		Easy:   easy,
-		Output: a,
-		Cfg:    cfg,
-		PackageName: baseDir,
+		Types:       tp,
+		Cache:       c,
+		Easy:        easy,
+		Output:      a,
+		Cfg:         cfg,
+		PackageName: pkg,
 	})
 }