Skip to content

Commit

Permalink
chore: update version
Browse files Browse the repository at this point in the history
  • Loading branch information
@li-jin-gou
li-jin-gou committed Oct 9, 2023
1 parent 78e6ca6 commit a8cf033
Show file tree
Hide file tree
Showing 6 changed files with 137 additions and 1,056 deletions.
22 changes: 5 additions & 17 deletions binding/custom_error/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,7 @@ func (e *ValidateError) Error() string {
return e.ErrType + ": expr_path=" + e.FailField + ", cause=invalid"
}

func init() {
CustomBindErrFunc := func(failField, msg string) error {
err := BindError{
ErrType: "bindErr",
FailField: "[bindFailField]: " + failField,
Msg: "[bindErrMsg]: " + msg,
}

return &err
}

func main() {
CustomValidateErrFunc := func(failField, msg string) error {
err := ValidateError{
ErrType: "validateErr",
Expand All @@ -73,12 +63,10 @@ func init() {

return &err
}

binding.SetErrorFactory(CustomBindErrFunc, CustomValidateErrFunc)
}

func main() {
h := server.Default(server.WithHostPorts("127.0.0.1:8080"))
validateConfig := binding.NewValidateConfig()
validateConfig.SetValidatorErrorFactory(CustomValidateErrFunc)
h := server.Default(server.WithHostPorts("127.0.0.1:8080"),
server.WithValidateConfig(validateConfig))

h.GET("bindErr", func(ctx context.Context, c *app.RequestContext) {
type TestBind struct {
Expand Down
17 changes: 9 additions & 8 deletions binding/custom_type_resolve/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import (
"reflect"
"time"

"github.com/cloudwego/hertz/pkg/route/param"

"github.com/cloudwego/hertz/pkg/app"
"github.com/cloudwego/hertz/pkg/app/client"
"github.com/cloudwego/hertz/pkg/app/server"
Expand All @@ -39,20 +41,19 @@ type TestBind struct {
A Nested `query:"a"`
}

func init() {
binding.MustRegTypeUnmarshal(reflect.TypeOf(Nested{}), func(v string, emptyAsZero bool) (reflect.Value, error) {
if v == "" && emptyAsZero {
func main() {
bindConfig := binding.NewBindConfig()
bindConfig.MustRegTypeUnmarshal(reflect.TypeOf(Nested{}), func(req *protocol.Request, params param.Params, text string) (reflect.Value, error) {
if text == "" {
return reflect.ValueOf(Nested{}), nil
}
val := Nested{
B: v[:5],
C: v[5:],
B: text[:5],
C: text[5:],
}
// 此外，也可以利用 req, params 来获取其他参数进行参数绑定
return reflect.ValueOf(val), nil
})
}

func main() {
h := server.Default(server.WithHostPorts("127.0.0.1:8080"))

h.GET("customType", func(ctx context.Context, c *app.RequestContext) {
Expand Down
8 changes: 3 additions & 5 deletions binding/custom_validate_func/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ type ValidateStruct struct {
A string `query:"a" vd:"test($)"`
}

func init() {
binding.MustRegValidateFunc("test", func(args ...interface{}) error {
func main() {
validateConfig := binding.NewValidateConfig()
validateConfig.MustRegValidateFunc("test", func(args ...interface{}) error {
if len(args) != 1 {
return fmt.Errorf("the args must be one")
}
Expand All @@ -44,9 +45,6 @@ func init() {
}
return nil
})
}

func main() {
h := server.Default(server.WithHostPorts("127.0.0.1:8080"))

h.GET("customValidate", func(ctx context.Context, c *app.RequestContext) {
Expand Down
8 changes: 3 additions & 5 deletions binding/loose_zero/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,10 @@ import (
"github.com/cloudwego/hertz/pkg/protocol/consts"
)

func init() {
binding.SetLooseZeroMode(true)
}

func main() {
h := server.Default(server.WithHostPorts("127.0.0.1:8080"))
bindConfig := binding.NewBindConfig()
bindConfig.LooseZeroMode = true
h := server.Default(server.WithHostPorts("127.0.0.1:8080"), server.WithBindConfig(bindConfig))

h.GET("looseZero", func(ctx context.Context, c *app.RequestContext) {
type Loose struct {
Expand Down
93 changes: 90 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module github.com/cloudwego/hertz-examples

go 1.16
go 1.21.1

require (
github.com/alibaba/sentinel-golang v1.0.4
github.com/apache/thrift v0.16.0
github.com/cloudwego/hertz v0.6.8
github.com/cloudwego/kitex v0.6.1
github.com/cloudwego/hertz v0.7.0
github.com/cloudwego/kitex v0.7.2
github.com/hertz-contrib/cors v0.0.0-20230423034624-2bc83a8400f0
github.com/hertz-contrib/csrf v0.1.1
github.com/hertz-contrib/gzip v0.0.1
Expand Down Expand Up @@ -37,6 +37,93 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0
)

require (
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
github.com/andeya/ameda v1.5.3 // indirect
github.com/andeya/goutil v1.0.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/bytedance/gopkg v0.0.0-20230728082804-614d0af6619b // indirect
github.com/bytedance/sonic v1.9.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/chenzhuoyu/iasm v0.9.0 // indirect
github.com/choleraehyq/pid v0.0.17 // indirect
github.com/cloudwego/configmanager v0.2.0 // indirect
github.com/cloudwego/dynamicgo v0.1.3 // indirect
github.com/cloudwego/fastpb v0.0.4 // indirect
github.com/cloudwego/frugal v0.1.8 // indirect
github.com/cloudwego/localsession v0.0.2 // indirect
github.com/cloudwego/netpoll v0.5.0 // indirect
github.com/cloudwego/thriftgo v0.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/fatih/structtag v1.2.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.4 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/pprof v0.0.0-20230509042627-b1315fad0c5a // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/context v1.1.1 // indirect
github.com/gorilla/securecookie v1.1.1 // indirect
github.com/gorilla/sessions v1.2.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
github.com/iancoleman/strcase v0.2.0 // indirect
github.com/jhump/protoreflect v1.8.2 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/gls v0.0.0-20220109145502-612d0167dce5 // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/nacos-group/nacos-sdk-go v1.1.2 // indirect
github.com/nyaruka/phonenumbers v1.1.6 // indirect
github.com/oleiade/lane v1.0.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/rs/zerolog v1.28.0 // indirect
github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d // indirect
github.com/shirou/gopsutil/v3 v3.21.6 // indirect
github.com/tidwall/gjson v1.14.4 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/tklauser/go-sysconf v0.3.6 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.42.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect
go.opentelemetry.io/contrib/propagators/ot v1.17.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.23.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e // indirect
google.golang.org/grpc v1.55.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)

require (
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1764 // indirect
Expand Down
Loading

0 comments on commit a8cf033

Please sign in to comment.