add config feature for package gcmd

os/gcfg/gcfg.go

@@ -13,9 +13,9 @@ import (
 
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/container/gvar"
+	"github.com/gogf/gf/v2/internal/command"
 	"github.com/gogf/gf/v2/internal/intlog"
 	"github.com/gogf/gf/v2/internal/utils"
-	"github.com/gogf/gf/v2/os/gcmd"
 	"github.com/gogf/gf/v2/os/genv"
 )
 
@@ -166,8 +166,8 @@ func (c *Config) GetWithCmd(ctx context.Context, pattern string, def ...interfac
 		return nil, err
 	}
 	if value == nil {
-		if v := gcmd.GetOpt(utils.FormatCmdKey(pattern)); v != nil {
-			return v, nil
+		if v := command.GetOpt(utils.FormatCmdKey(pattern)); v != "" {
+			return gvar.New(v), nil
 		}
 		if len(def) > 0 {
 			return gvar.New(def[0]), nil

os/gcfg/gcfg_adapter_file.go

@@ -15,8 +15,8 @@ import (
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/internal/command"
 	"github.com/gogf/gf/v2/internal/intlog"
-	"github.com/gogf/gf/v2/os/gcmd"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/gfsnotify"
 	"github.com/gogf/gf/v2/os/gres"
@@ -62,7 +62,7 @@ func NewAdapterFile(file ...string) (*AdapterFile, error) {
 		name = file[0]
 	} else {
 		// Custom default configuration file name from command line or environment.
-		if customFile := gcmd.GetOptWithEnv(commandEnvKeyForFile).String(); customFile != "" {
+		if customFile := command.GetOptWithEnv(commandEnvKeyForFile); customFile != "" {
 			name = customFile
 		}
 	}
@@ -72,7 +72,7 @@ func NewAdapterFile(file ...string) (*AdapterFile, error) {
 		jsonMap:     gmap.NewStrAnyMap(true),
 	}
 	// Customized dir path from env/cmd.
-	if customPath := gcmd.GetOptWithEnv(commandEnvKeyForPath).String(); customPath != "" {
+	if customPath := command.GetOptWithEnv(commandEnvKeyForPath); customPath != "" {
 		if gfile.Exists(customPath) {
 			if err = c.SetPath(customPath); err != nil {
 				return nil, err

os/gcmd/gcmd_command.go

@@ -28,6 +28,7 @@ type Command struct {
 	Additional    string        // Additional info about this command, which will be appended to the end of help info.
 	NeedArgs      bool          // NeedArgs specifies this command needs arguments.
 	Strict        bool          // Strict parsing options, which means it returns error if invalid option given.
+	Config        string        // Config node name, which also retrieves the values from config component along with command line.
 	parent        *Command      // Parent command for internal usage.
 	commands      []Command     // Sub commands of this command.
 }

os/gcmd/gcmd_command_run.go

@@ -12,7 +12,10 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v2/util/gutil"
 )
 
 // Run calls custom function that bound to this command.
@@ -84,7 +87,6 @@ func (c *Command) reParse(ctx context.Context, parser *Parser) (*Parser, error)
 	if len(c.Options) == 0 {
 		return parser, nil
 	}
-
 	var (
 		optionKey        string
 		supportedOptions = make(map[string]bool)
@@ -97,7 +99,30 @@ func (c *Command) reParse(ctx context.Context, parser *Parser) (*Parser, error)
 		}
 		supportedOptions[optionKey] = !option.Orphan
 	}
-	return Parse(supportedOptions, c.Strict)
+	parser, err := Parse(supportedOptions, c.Strict)
+	if err != nil {
+		return nil, err
+	}
+	// Retrieve option values from config component if it has "config" tag.
+	if c.Config != "" && gcfg.Instance().Available(ctx) {
+		value, err := gcfg.Instance().Get(ctx, c.Config)
+		if err != nil {
+			return nil, err
+		}
+		configMap := value.Map()
+		for optionName, _ := range parser.passedOptions {
+			// The command line has the high priority.
+			if parser.ContainsOpt(optionName) {
+				continue
+			}
+			// Merge the config value into parser.
+			foundKey, foundValue := gutil.MapPossibleItemByKey(configMap, optionName)
+			if foundKey != "" {
+				parser.parsedOptions[optionName] = gconv.String(foundValue)
+			}
+		}
+	}
+	return parser, nil
 }
 
 // searchCommand recursively searches the command according given arguments.

os/genv/genv.go

@@ -12,8 +12,8 @@ import (
 	"strings"
 
 	"github.com/gogf/gf/v2/container/gvar"
+	"github.com/gogf/gf/v2/internal/command"
 	"github.com/gogf/gf/v2/internal/utils"
-	"github.com/gogf/gf/v2/os/gcmd"
 )
 
 // All returns a copy of strings representing the environment,
@@ -94,8 +94,8 @@ func GetWithCmd(key string, def ...interface{}) *gvar.Var {
 		return gvar.New(v)
 	}
 	cmdKey := utils.FormatCmdKey(key)
-	if v := gcmd.GetOpt(cmdKey); !v.IsEmpty() {
-		return v
+	if v := command.GetOpt(cmdKey); v != "" {
+		return gvar.New(v)
 	}
 	if len(def) > 0 {
 		return gvar.New(def[0])

protocol/goai/goai.go

@@ -96,6 +96,8 @@ var (
 		"sm":  "summary",
 		"des": "description",
 		"dc":  "description",
+		"eg":  "example",
+		"egs": "examples",
 	}
 )
 

protocol/goai/goai_path.go

@@ -34,7 +34,7 @@ type Path struct {
 	Parameters  Parameters `json:"parameters,omitempty"  yaml:"parameters,omitempty"`
 }
 
-// Paths is specified by OpenAPI/Swagger standard version 3.0.
+// Paths are specified by OpenAPI/Swagger standard version 3.0.
 type Paths map[string]Path
 
 const (

util/gmode/gmode.go

@@ -11,7 +11,7 @@ package gmode
 
 import (
 	"github.com/gogf/gf/v2/debug/gdebug"
-	"github.com/gogf/gf/v2/os/gcmd"
+	"github.com/gogf/gf/v2/internal/command"
 	"github.com/gogf/gf/v2/os/gfile"
 )
 
@@ -58,7 +58,7 @@ func SetProduct() {
 func Mode() string {
 	// If current mode is not set, do this auto check.
 	if currentMode == NOT_SET {
-		if v := gcmd.GetOptWithEnv(commandEnvKey).String(); v != "" {
+		if v := command.GetOptWithEnv(commandEnvKey); v != "" {
 			// Mode configured from command argument of environment.
 			currentMode = v
 		} else {