修复默认值

Author: storezhang

binder.go

@@ -11,23 +11,24 @@ import (
 	`strconv`
 	`strings`
 
-	`github.com/creasty/defaults`
 	`github.com/labstack/echo/v4`
+	`github.com/storezhang/god`
 	`github.com/vmihailenco/msgpack/v5`
 	`google.golang.org/protobuf/proto`
 )
 
 type binder struct {
-	tagParam  string
-	tagQuery  string
-	tagForm   string
-	tagHeader string
+	tagParam   string
+	tagQuery   string
+	tagForm    string
+	tagHeader  string
+	tagDefault string
 }
 
 func (b *binder) Bind(value interface{}, ctx echo.Context) (err error) {
 	// 处理默认值
 	defer func() {
-		err = defaults.Set(value)
+		err = god.Set(value, god.Tag(b.tagDefault))
 	}()
 
 	if err = b.params(ctx, value); nil != err {

go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/rs/xid v1.3.0
 	github.com/storezhang/gox v1.8.1
+	github.com/storezhang/god v0.0.2
 	github.com/storezhang/validatorx v1.0.8
 	github.com/vmihailenco/msgpack/v5 v5.3.4
 	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect

option.go

@@ -1,19 +1,20 @@
 package echox
 
 var defaultOptions = &options{
-	addr: ":9000",
+	addr: `:9000`,
 	binder: &binder{
-		tagParam:  "param",
-		tagQuery:  "query",
-		tagForm:   "form",
-		tagHeader: "header",
+		tagParam:   `param`,
+		tagQuery:   `query`,
+		tagForm:    `form`,
+		tagHeader:  `header`,
+		tagDefault: `default`,
 	},
 	validate:   true,
 	banner:     false,
 	error:      errorHandlerFunc,
 	crosEnable: true,
 	cros: crosConfig{
-		origins:     []string{"*"},
+		origins:     []string{`*`},
 		credentials: true,
 	},
 	panicStack: panicStackConfig{

option_binder.go

@@ -3,20 +3,23 @@ package echox
 var _ option = (*optionBinder)(nil)
 
 type optionBinder struct {
-	param   string
-	query   string
-	form    string
-	header  string
+	param    string
+	query    string
+	form     string
+	header   string
+	_default string
+
 	disable bool
 }
 
 // Binder 配置数据绑定
-func Binder(param string, query string, form string, header string) *optionBinder {
+func Binder(param string, query string, form string, header string, _default string) *optionBinder {
 	return &optionBinder{
-		param:  param,
-		query:  query,
-		form:   form,
-		header: header,
+		param:    param,
+		query:    query,
+		form:     form,
+		header:   header,
+		_default: _default,
 	}
 }
 
@@ -35,5 +38,6 @@ func (b *optionBinder) apply(options *options) {
 		options.binder.tagQuery = b.query
 		options.binder.tagForm = b.form
 		options.binder.tagHeader = b.header
+		options.binder.tagDefault = b._default
 	}
 }