Bläddra i källkod

升级到v2.0.1

dcsunny 4 år sedan
förälder
incheckning
d84a379faa
3 ändrade filer med 7 tillägg och 32 borttagningar
  1. 2 1
      go.mod
  2. 4 0
      go.sum
  3. 1 31
      http/handle.go

+ 2 - 1
go.mod

@@ -7,8 +7,9 @@ require (
 	github.com/dcsunny/gocrypt v0.0.0-20200828060317-4dec5212cc15
 	github.com/dcsunny/mwt v0.0.0-20210128034911-2f50006077f5
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/go-kratos/kratos/v2 v2.0.0
+	github.com/go-kratos/kratos/v2 v2.0.1
 	github.com/go-resty/resty/v2 v2.3.0
+	github.com/gorilla/schema v1.2.0 // indirect
 	github.com/lestrrat-go/jwx v1.1.5
 	github.com/vmihailenco/msgpack/v5 v5.3.0
 	google.golang.org/genproto v0.0.0-20210629200056-84d6f6074151

+ 4 - 0
go.sum

@@ -33,6 +33,8 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-kratos/kratos/v2 v2.0.0 h1:3IS/6jgbFfQtK9PTRs4mEhhXXA36xnKTaTKfcKiO96I=
 github.com/go-kratos/kratos/v2 v2.0.0/go.mod h1:USzTcAP7LS1rHVITQ/x/5JvlkUpG17pnfbqYV4j7SWc=
+github.com/go-kratos/kratos/v2 v2.0.1 h1:iFteVlcLWnAQu5n4I5bTN63svW+0YylGwhNTYO2MkOQ=
+github.com/go-kratos/kratos/v2 v2.0.1/go.mod h1:Jz6fuJFF2SLczQ7Y8ocKieVGgstQKa+R9NX09bCHekU=
 github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/form/v4 v4.1.3 h1:SMUgkH+XBQkssHylgYzmy2VV4r37/pBYHgQnyqeBmmM=
@@ -66,6 +68,7 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/schema v1.2.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlIO2eleU=
@@ -151,6 +154,7 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

+ 1 - 31
http/handle.go

@@ -82,7 +82,7 @@ func parseForm(req *http.Request, v interface{}) error {
 	return err
 }
 
-// encodeResponse encodes the object to the HTTP response.
+//EncodeResponse encodes the object to the HTTP response.
 func EncodeResponse(w http.ResponseWriter, r *http.Request, v interface{}) error {
 	codec := codecForRequest(r)
 	data, err := codec.Marshal(v)
@@ -144,36 +144,6 @@ func ErrHandle(w http.ResponseWriter, r *http.Request, err error) {
 		return
 	}
 	w.Write(data)
-
-	//se := errors.FromError(err)
-	//if !ok {
-	//	se = &errors.StatusError{
-	//		Code:    10500,
-	//		Message: err.Error(),
-	//	}
-	//}
-	//if se.Code == -1 {
-	//	return
-	//}
-	//codec := codecForRequest(r)
-	//w.Header().Set(ContentTypeHeader, contentType(codec.Name()))
-	//if se.Code == 0 {
-	//	w.WriteHeader(200)
-	//} else if se.Code >= 301 && se.Code <= 307 {
-	//	w.WriteHeader(int(se.Code))
-	//	http.Redirect(w, r, se.Message, int(se.Code))
-	//	return
-	//} else {
-	//	if se.Code < 10000 {
-	//		se.Code = 10000 + se.Code
-	//	}
-	//	if se.Code < 10100 && se.Message == "" {
-	//		se.Message = "系统错误"
-	//	}
-	//	w.WriteHeader(400)
-	//}
-	//data, _ := codec.Marshal(se)
-	//_, _ = w.Write(data)
 }
 
 const baseContentType = "application"