优化注册全局中间件逻辑

router/server.go

@@ -12,6 +12,7 @@ import (
 	apiDoc "git.zhangdeman.cn/gateway/api-doc"
 	"git.zhangdeman.cn/zhangdeman/consts"
 	"git.zhangdeman.cn/zhangdeman/gin/middleware"
+	"git.zhangdeman.cn/zhangdeman/gin/middleware/request_cors"
 	"github.com/gin-contrib/pprof"
 	"net/http"
 	"strings"
@@ -68,19 +69,24 @@ func NewServer(port int, optionList ...SetServerOptionFunc) *server {
 		panic("port should be greater than 80")
 	}
 	option := newServerOption(port, optionList...)
+	globalMiddlewareList := make([]gin.HandlerFunc, 0)
+	if option.enableRequestInit {
+		globalMiddlewareList = append(globalMiddlewareList, middleware.InitRequest())
+	}
+	if option.enableCors {
+		globalMiddlewareList = append(globalMiddlewareList, request_cors.New(request_cors.Config{
+			AllowAllOrigins: true,
+		}))
+	}
+	if len(option.globalMiddlewareList) > 0 {
+		// 自定义全局中间件追加
+		globalMiddlewareList = append(globalMiddlewareList, option.globalMiddlewareList...)
+	}
 	r := gin.Default()
 
-	r.Use(
-		// 初始化请求
-		middleware.InitRequest(), // 初始化请求
-		/*request_cors.New(request_cors.Config{
-			AllowAllOrigins: true,
-		}), */// middleware.Ac
-	)
-	if nil != option.globalMiddlewareList {
-		// 启用全局中间件
-		r.Use(option.globalMiddlewareList...)
-	}
+	// 注册全局中间件
+	r.Use(globalMiddlewareList...)
+
 	// 启用pprof, 注册相关路由
 	if option.enablePprof {
 		pprof.Register(r)