blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 11:18:50 +08:00
Code Issues Projects Releases Wiki Activity

fix issue #1625

Browse Source
This commit is contained in:
John Guo 2022-02-24 22:07:27 +08:00
parent d27db119a0
commit b5e8e68713
5 changed files with 54 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
net/ghttp/ghttp.go
View File

@ -123,20 +123,21 @@ const (
)
const (
supportedHttpMethods = "GET,PUT,POST,DELETE,PATCH,HEAD,CONNECT,OPTIONS,TRACE"
defaultMethod = "ALL"
exceptionExit = "exit"
exceptionExitAll = "exit_all"
exceptionExitHook = "exit_hook"
routeCacheDuration = time.Hour
methodNameInit = "Init"
methodNameShut = "Shut"
ctxKeyForRequest = "gHttpRequestObject"
contentTypeXml = "text/xml"
contentTypeHtml = "text/html"
contentTypeJson = "application/json"
swaggerUIPackedPath = "/goframe/swaggerui"
responseTraceIDHeader = "Trace-ID"
supportedHttpMethods = "GET,PUT,POST,DELETE,PATCH,HEAD,CONNECT,OPTIONS,TRACE"
defaultMethod = "ALL"
exceptionExit = "exit"
exceptionExitAll = "exit_all"
exceptionExitHook = "exit_hook"
routeCacheDuration = time.Hour
ctxKeyForRequest = "gHttpRequestObject"
contentTypeXml = "text/xml"
contentTypeHtml = "text/html"
contentTypeJson = "application/json"
swaggerUIPackedPath = "/goframe/swaggerui"
responseTraceIDHeader = "Trace-ID"
specialMethodNameInit = "Init"
specialMethodNameShut = "Shut"
specialMethodNameIndex = "Index"
)
var (

26
net/ghttp/ghttp_server_router.go
View File

@ -99,9 +99,7 @@ func (s *Server) setHandler(ctx context.Context, in setHandlerInput) {
// Change the registered route according meta info from its request structure.
if handler.Info.Type != nil && handler.Info.Type.NumIn() == 2 {
var (
objectReq = reflect.New(handler.Info.Type.In(1))
)
var objectReq = reflect.New(handler.Info.Type.In(1))
if v := gmeta.Get(objectReq, goai.TagNamePath); !v.IsEmpty() {
uri = v.String()
}
@ -132,12 +130,22 @@ func (s *Server) setHandler(ctx context.Context, in setHandlerInput) {
if !s.config.RouteOverWrite {
switch handler.Type {
case HandlerTypeHandler, HandlerTypeObject:
if item, ok := s.routesMap[routerKey]; ok {
s.Logger().Fatalf(
ctx,
`duplicated route registry "%s" at %s , already registered at %s`,
pattern, handler.Source, item[0].Source,
)
if items, ok := s.routesMap[routerKey]; ok {
var duplicatedHandler *handlerItem
for _, item := range items {
switch item.Handler.Type {
case HandlerTypeHandler, HandlerTypeObject:
duplicatedHandler = item.Handler
break
}
}
if duplicatedHandler != nil {
s.Logger().Fatalf(
ctx,
`duplicated route registry "%s" at %s , already registered at %s`,
pattern, handler.Source, duplicatedHandler.Source,
)
}
return
}
}

4
net/ghttp/ghttp_server_service_handler.go
View File

@ -23,9 +23,7 @@ import (
// 1. func(*ghttp.Request)
// 2. func(context.Context, BizRequest)(BizResponse, error)
func (s *Server) BindHandler(pattern string, handler interface{}) {
var (
ctx = context.TODO()
)
var ctx = context.TODO()
funcInfo, err := s.checkAndCreateFuncInfo(handler, "", "", "")
if err != nil {
s.Logger().Fatalf(ctx, `%+v`, err)

37
net/ghttp/ghttp_server_service_object.go
View File

@ -76,9 +76,7 @@ type doBindObjectInput struct {
func (s *Server) doBindObject(ctx context.Context, in doBindObjectInput) {
// Convert input method to map for convenience and high performance searching purpose.
var (
methodMap map[string]bool
)
var methodMap map[string]bool
if len(in.Method) > 0 {
methodMap = make(map[string]bool)
for _, v := range strings.Split(in.Method, ",") {
@ -112,11 +110,11 @@ func (s *Server) doBindObject(ctx context.Context, in doBindObjectInput) {
reflectType = reflectValue.Type()
}
structName := reflectType.Elem().Name()
if reflectValue.MethodByName("Init").IsValid() {
initFunc = reflectValue.MethodByName("Init").Interface().(func(*Request))
if reflectValue.MethodByName(specialMethodNameInit).IsValid() {
initFunc = reflectValue.MethodByName(specialMethodNameInit).Interface().(func(*Request))
}
if reflectValue.MethodByName("Shut").IsValid() {
shutFunc = reflectValue.MethodByName("Shut").Interface().(func(*Request))
if reflectValue.MethodByName(specialMethodNameShut).IsValid() {
shutFunc = reflectValue.MethodByName(specialMethodNameShut).Interface().(func(*Request))
}
pkgPath := reflectType.Elem().PkgPath()
pkgName := gfile.Basename(pkgPath)
@ -125,7 +123,7 @@ func (s *Server) doBindObject(ctx context.Context, in doBindObjectInput) {
if methodMap != nil && !methodMap[methodName] {
continue
}
if methodName == "Init" || methodName == "Shut" {
if methodName == specialMethodNameInit || methodName == specialMethodNameShut {
continue
}
objName := gstr.Replace(reflectType.String(), fmt.Sprintf(`%s.`, pkgName), "")
@ -155,7 +153,12 @@ func (s *Server) doBindObject(ctx context.Context, in doBindObjectInput) {
//
// Note that if there's built-in variables in pattern, this route will not be added
// automatically.
if strings.EqualFold(methodName, "Index") && !gregex.IsMatchString(`\{\.\w+\}`, in.Pattern) {
var (
isIndexMethod = strings.EqualFold(methodName, specialMethodNameIndex)
hasBuildInVar = gregex.IsMatchString(`\{\.\w+\}`, in.Pattern)
hashTwoParams = funcInfo.Type.NumIn() == 2
)
if isIndexMethod && !hasBuildInVar && !hashTwoParams {
p := gstr.PosRI(key, "/index")
k := key[0:p] + key[p+6:]
if len(k) == 0 || k[0] == '@' {
@ -209,11 +212,11 @@ func (s *Server) doBindObjectMethod(ctx context.Context, in doBindObjectMethodIn
s.Logger().Fatalf(ctx, "invalid method name: %s", methodName)
return
}
if reflectValue.MethodByName("Init").IsValid() {
initFunc = reflectValue.MethodByName("Init").Interface().(func(*Request))
if reflectValue.MethodByName(specialMethodNameInit).IsValid() {
initFunc = reflectValue.MethodByName(specialMethodNameInit).Interface().(func(*Request))
}
if reflectValue.MethodByName("Shut").IsValid() {
shutFunc = reflectValue.MethodByName("Shut").Interface().(func(*Request))
if reflectValue.MethodByName(specialMethodNameShut).IsValid() {
shutFunc = reflectValue.MethodByName(specialMethodNameShut).Interface().(func(*Request))
}
var (
pkgPath = reflectType.Elem().PkgPath()
@ -260,11 +263,11 @@ func (s *Server) doBindObjectRest(ctx context.Context, in doBindObjectInput) {
reflectType = reflectValue.Type()
}
structName := reflectType.Elem().Name()
if reflectValue.MethodByName(methodNameInit).IsValid() {
initFunc = reflectValue.MethodByName(methodNameInit).Interface().(func(*Request))
if reflectValue.MethodByName(specialMethodNameInit).IsValid() {
initFunc = reflectValue.MethodByName(specialMethodNameInit).Interface().(func(*Request))
}
if reflectValue.MethodByName(methodNameShut).IsValid() {
shutFunc = reflectValue.MethodByName(methodNameShut).Interface().(func(*Request))
if reflectValue.MethodByName(specialMethodNameShut).IsValid() {
shutFunc = reflectValue.MethodByName(specialMethodNameShut).Interface().(func(*Request))
}
pkgPath := reflectType.Elem().PkgPath()
for i := 0; i < reflectValue.NumMethod(); i++ {

2
net/ghttp/ghttp_z_unit_feature_router_handler_extended_test.go
View File

@ -82,7 +82,7 @@ type TestForHandlerWithObjectAndMeta2Res struct {
type ControllerForHandlerWithObjectAndMeta1 struct{}
func (ControllerForHandlerWithObjectAndMeta1) Test1(ctx context.Context, req *TestForHandlerWithObjectAndMeta1Req) (res *TestForHandlerWithObjectAndMeta1Res, err error) {
func (ControllerForHandlerWithObjectAndMeta1) Index(ctx context.Context, req *TestForHandlerWithObjectAndMeta1Req) (res *TestForHandlerWithObjectAndMeta1Res, err error) {
return &TestForHandlerWithObjectAndMeta1Res{
Id: 1,
Age: req.Age,