Browse Source

fix: gateway conf doesn't work (#2968)

Kevin Wan 2 years ago
parent
commit
0d5a68869d
3 changed files with 1 additions and 4 deletions
  1. 0 3
      gateway/config.go
  2. 0 1
      gateway/server.go
  3. 1 0
      rest/internal/cors/handlers.go

+ 0 - 3
gateway/config.go

@@ -1,8 +1,6 @@
 package gateway
 
 import (
-	"time"
-
 	"github.com/zeromicro/go-zero/rest"
 	"github.com/zeromicro/go-zero/zrpc"
 )
@@ -12,7 +10,6 @@ type (
 	GatewayConf struct {
 		rest.RestConf
 		Upstreams []Upstream
-		Timeout   time.Duration `json:",default=5s"`
 	}
 
 	// RouteMapping is a mapping between a gateway route and an upstream rpc method.

+ 0 - 1
gateway/server.go

@@ -38,7 +38,6 @@ func MustNewServer(c GatewayConf, opts ...Option) *Server {
 	svr := &Server{
 		Server:    rest.MustNewServer(c.RestConf),
 		upstreams: c.Upstreams,
-		timeout:   c.Timeout,
 	}
 	for _, opt := range opts {
 		opt(svr)

+ 1 - 0
rest/internal/cors/handlers.go

@@ -78,6 +78,7 @@ func checkAndSetHeaders(w http.ResponseWriter, r *http.Request, origins []string
 
 func isOriginAllowed(allows []string, origin string) bool {
 	origin = strings.ToLower(origin)
+
 	for _, allow := range allows {
 		if allow == allOrigins {
 			return true