fix(net/ghttp): Server Domain if is empty str, bind handler pattern will add @ which is not expect #4100

net/ghttp/ghttp_server_domain.go

@@ -32,15 +32,15 @@ func (s *Server) Domain(domains string) *Domain {
 // BindHandler binds the handler for the specified pattern.
 func (d *Domain) BindHandler(pattern string, handler interface{}) {
 	for domain := range d.domains {
-		d.server.BindHandler(pattern+"@"+domain, handler)
+		d.server.BindHandler(patternBindDomain(pattern, domain), handler)
 	}
 }
 
 func (d *Domain) doBindHandler(ctx context.Context, in doBindHandlerInput) {
 	for domain := range d.domains {
 		d.server.doBindHandler(ctx, doBindHandlerInput{
 			Prefix:     in.Prefix,
-			Pattern:    in.Pattern + "@" + domain,
+			Pattern:    patternBindDomain(in.Pattern, domain),
 			FuncInfo:   in.FuncInfo,
 			Middleware: in.Middleware,
 			Source:     in.Source,
@@ -51,15 +51,15 @@ func (d *Domain) doBindHandler(ctx context.Context, in doBindHandlerInput) {
 // BindObject binds the object for the specified pattern.
 func (d *Domain) BindObject(pattern string, obj interface{}, methods ...string) {
 	for domain := range d.domains {
-		d.server.BindObject(pattern+"@"+domain, obj, methods...)
+		d.server.BindObject(patternBindDomain(pattern, domain), obj, methods...)
 	}
 }
 
 func (d *Domain) doBindObject(ctx context.Context, in doBindObjectInput) {
 	for domain := range d.domains {
 		d.server.doBindObject(ctx, doBindObjectInput{
 			Prefix:     in.Prefix,
-			Pattern:    in.Pattern + "@" + domain,
+			Pattern:    patternBindDomain(in.Pattern, domain),
 			Object:     in.Object,
 			Method:     in.Method,
 			Middleware: in.Middleware,
@@ -71,15 +71,15 @@ func (d *Domain) doBindObject(ctx context.Context, in doBindObjectInput) {
 // BindObjectMethod binds the method for the specified pattern.
 func (d *Domain) BindObjectMethod(pattern string, obj interface{}, method string) {
 	for domain := range d.domains {
-		d.server.BindObjectMethod(pattern+"@"+domain, obj, method)
+		d.server.BindObjectMethod(patternBindDomain(pattern, domain), obj, method)
 	}
 }
 
 func (d *Domain) doBindObjectMethod(ctx context.Context, in doBindObjectMethodInput) {
 	for domain := range d.domains {
 		d.server.doBindObjectMethod(ctx, doBindObjectMethodInput{
 			Prefix:     in.Prefix,
-			Pattern:    in.Pattern + "@" + domain,
+			Pattern:    patternBindDomain(in.Pattern, domain),
 			Object:     in.Object,
 			Method:     in.Method,
 			Middleware: in.Middleware,
@@ -91,15 +91,15 @@ func (d *Domain) doBindObjectMethod(ctx context.Context, in doBindObjectMethodIn
 // BindObjectRest binds the RESTful API for the specified pattern.
 func (d *Domain) BindObjectRest(pattern string, obj interface{}) {
 	for domain := range d.domains {
-		d.server.BindObjectRest(pattern+"@"+domain, obj)
+		d.server.BindObjectRest(patternBindDomain(pattern, domain), obj)
 	}
 }
 
 func (d *Domain) doBindObjectRest(ctx context.Context, in doBindObjectInput) {
 	for domain := range d.domains {
 		d.server.doBindObjectRest(ctx, doBindObjectInput{
 			Prefix:     in.Prefix,
-			Pattern:    in.Pattern + "@" + domain,
+			Pattern:    patternBindDomain(in.Pattern, domain),
 			Object:     in.Object,
 			Method:     in.Method,
 			Middleware: in.Middleware,
@@ -111,15 +111,15 @@ func (d *Domain) doBindObjectRest(ctx context.Context, in doBindObjectInput) {
 // BindHookHandler binds the hook handler for the specified pattern.
 func (d *Domain) BindHookHandler(pattern string, hook HookName, handler HandlerFunc) {
 	for domain := range d.domains {
-		d.server.BindHookHandler(pattern+"@"+domain, hook, handler)
+		d.server.BindHookHandler(patternBindDomain(pattern, domain), hook, handler)
 	}
 }
 
 func (d *Domain) doBindHookHandler(ctx context.Context, in doBindHookHandlerInput) {
 	for domain := range d.domains {
 		d.server.doBindHookHandler(ctx, doBindHookHandlerInput{
 			Prefix:   in.Prefix,
-			Pattern:  in.Pattern + "@" + domain,
+			Pattern:  patternBindDomain(in.Pattern, domain),
 			HookName: in.HookName,
 			Handler:  in.Handler,
 			Source:   in.Source,
@@ -130,7 +130,7 @@ func (d *Domain) doBindHookHandler(ctx context.Context, in doBindHookHandlerInpu
 // BindHookHandlerByMap binds the hook handler for the specified pattern.
 func (d *Domain) BindHookHandlerByMap(pattern string, hookMap map[HookName]HandlerFunc) {
 	for domain := range d.domains {
-		d.server.BindHookHandlerByMap(pattern+"@"+domain, hookMap)
+		d.server.BindHookHandlerByMap(patternBindDomain(pattern, domain), hookMap)
 	}
 }
 
@@ -151,18 +151,25 @@ func (d *Domain) BindStatusHandlerByMap(handlerMap map[int]HandlerFunc) {
 // BindMiddleware binds the middleware for the specified pattern.
 func (d *Domain) BindMiddleware(pattern string, handlers ...HandlerFunc) {
 	for domain := range d.domains {
-		d.server.BindMiddleware(pattern+"@"+domain, handlers...)
+		d.server.BindMiddleware(patternBindDomain(pattern, domain), handlers...)
 	}
 }
 
 // BindMiddlewareDefault binds the default middleware for the specified pattern.
 func (d *Domain) BindMiddlewareDefault(handlers ...HandlerFunc) {
 	for domain := range d.domains {
-		d.server.BindMiddleware(defaultMiddlewarePattern+"@"+domain, handlers...)
+		d.server.BindMiddleware(patternBindDomain(defaultMiddlewarePattern, domain), handlers...)
 	}
 }
 
 // Use adds middleware to the domain.
 func (d *Domain) Use(handlers ...HandlerFunc) {
 	d.BindMiddlewareDefault(handlers...)
 }
+
+func patternBindDomain(pattern, domain string) string {
+	if domain != "" {
+		return pattern + "@" + domain
+	}
+	return pattern
+}