优化WebSocket服务器路由和授权处理逻辑

- 优化AuthorizationMiddleware中的Bearer token处理
- 重构createTaskServer函数，简化handler参数处理
- 重命名createhandlerauthorization为createhandlerauthorization_websocket
- 优化WebSocket路由处理，使用strings.TrimPrefix替代Param获取路径
- 改进路由中间件组合逻辑

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: masx200

go_ws_sh/authorizationmiddleware.go

@@ -12,14 +12,10 @@ import (
 func AuthorizationMiddleware(credentialdb *gorm.DB, tokendb *gorm.DB, sessiondb *gorm.DB) HertzMiddleWare {
 	return func(c context.Context, r *app.RequestContext, next HertzNext) {
 
+		bearertoken := r.Request.Header.Get("authorization")
 
+		if bearertoken != "" {
 
-		bearertoken:=r.Request.Header.Get("authorization")
-
-
-
-		if bearertoken!=""{
-			
 		}
 		var req struct {
 			Authorization CredentialsClient `json:"authorization"`

go_ws_sh/createTaskServer.go

@@ -1,7 +1,7 @@
 package go_ws_sh
 
 import (
-	"context"
+	// "context"
 	"crypto/tls"
 	"log"
 	"time"
@@ -16,6 +16,7 @@ import (
 	"github.com/hertz-contrib/http2/config"
 	factoryh2 "github.com/hertz-contrib/http2/factory"
 	"github.com/hertz-contrib/logger/accesslog"
+
 	quic "github.com/masx200/go_ws_sh/network/quic-go"
 	http3 "github.com/masx200/go_ws_sh/server/quic-go"
 	factoryh3 "github.com/masx200/go_ws_sh/server/quic-go/factory"
@@ -72,7 +73,7 @@ func InitHertzApp(hertzapp *server.Hertz) {
 	// 	ctx.Next(c)
 	// })
 }
-func createTaskServer(serverconfig ServerConfig, handler func(w context.Context, r *app.RequestContext), middlewares ...app.HandlerFunc) func() (interface{}, error) {
+func createTaskServer(serverconfig ServerConfig /* handler func(w context.Context, r *app.RequestContext), */, middlewares ...app.HandlerFunc) func() (any, error) {
 	if serverconfig.Alpn == "h2" {
 
 		return func() (interface{}, error) {
@@ -120,9 +121,9 @@ func createTaskServer(serverconfig ServerConfig, handler func(w context.Context,
 			for _, middleware := range middlewares {
 				hertzapp.Use(middleware)
 			}
-			hertzapp.Any("/*name", func(c context.Context, ctx *app.RequestContext) {
-				handler(c, ctx)
-			})
+			// hertzapp.Any("/*name", func(c context.Context, ctx *app.RequestContext) {
+			// 	handler(c, ctx)
+			// })
 			x := hertzapp.Run()
 			if x != nil {
 				log.Fatal(x)
@@ -180,9 +181,9 @@ func createTaskServer(serverconfig ServerConfig, handler func(w context.Context,
 			for _, middleware := range middlewares {
 				hertzapp.Use(middleware)
 			}
-			hertzapp.Any("/*name", func(c context.Context, ctx *app.RequestContext) {
-				handler(c, ctx)
-			})
+			// hertzapp.Any("/*name", func(c context.Context, ctx *app.RequestContext) {
+			// 	handler(c, ctx)
+			// })
 			x := hertzapp.Run()
 			if x != nil {
 				log.Fatal(x)
@@ -202,9 +203,9 @@ func createTaskServer(serverconfig ServerConfig, handler func(w context.Context,
 			for _, middleware := range middlewares {
 				hertzapp.Use(middleware)
 			}
-			hertzapp.Any("/*name", func(c context.Context, ctx *app.RequestContext) {
-				handler(c, ctx)
-			})
+			// hertzapp.Any("/*name", func(c context.Context, ctx *app.RequestContext) {
+			// 	handler(c, ctx)
+			// })
 			x := hertzapp.Run()
 			if x != nil {
 				log.Fatal(x)

go_ws_sh/createhandlerauthorization.go

@@ -12,7 +12,7 @@ import (
 	"gorm.io/gorm"
 )
 
-func createhandlerauthorization(credentialdb *gorm.DB, tokendb *gorm.DB, next func(w context.Context, r *app.RequestContext)) func(w context.Context, r *app.RequestContext) {
+func createhandlerauthorization_websocket(credentialdb *gorm.DB, tokendb *gorm.DB, next func(w context.Context, r *app.RequestContext)) func(w context.Context, r *app.RequestContext) {
 
 	return func(w context.Context, r *app.RequestContext) {
 

go_ws_sh/pipe-std-ws-server.go

@@ -42,9 +42,9 @@ func RequestLoggerMiddleware() app.HandlerFunc {
 func pipe_std_ws_server(config ConfigServer, credentialdb *gorm.DB, tokendb *gorm.DB, sessiondb *gorm.DB) {
 	// var listtokensHandler = ListTokensHandler(credentialdb, tokendb)
 	// authHandler := AuthorizationHandler(credentialdb, tokendb)
-	var routes []RouteConfig //{
+	//{
 
-	handlerGetWebsocket := createhandlerauthorization(credentialdb, tokendb, func(w context.Context, r *app.RequestContext) {
+	handlerGetWebsocket := createhandlerauthorization_websocket(credentialdb, tokendb, func(w context.Context, r *app.RequestContext) {
 
 		sessions, err := ReadAllSessions(sessiondb)
 		if err != nil {
@@ -55,7 +55,7 @@ func pipe_std_ws_server(config ConfigServer, credentialdb *gorm.DB, tokendb *gor
 		for _, session := range sessions {
 			handlermap[session.Name] = createhandleWebSocket(session)
 		}
-		var name = r.Param("name")
+		var name = strings.TrimPrefix(string(r.Path()), "/") //r.Param("name")
 		if handler2, ok := handlermap[name]; ok {
 
 			handler2(w, r)
@@ -80,7 +80,7 @@ func pipe_std_ws_server(config ConfigServer, credentialdb *gorm.DB, tokendb *gor
 	// })
 	var initial_credentials = config.InitialCredentials
 	var initial_sessions = config.InitialSessions
-	routes = GenerateRoutesHttp(credentialdb, tokendb, sessiondb, initial_credentials, initial_sessions)
+	var routeshttp []RouteConfig = GenerateRoutesHttp(credentialdb, tokendb, sessiondb, initial_credentials, initial_sessions)
 	// routes = append(gr, routes...)
 	composedMiddleware := HertzCompose(
 		MatchAndRouteMiddleware([]RouteConfig{
@@ -101,7 +101,7 @@ func pipe_std_ws_server(config ConfigServer, credentialdb *gorm.DB, tokendb *gor
 			},
 		}),
 
-		MatchAndRouteMiddleware(routes))
+		MatchAndRouteMiddleware(routeshttp))
 	handler := func(w context.Context, r *app.RequestContext) {
 
 		Upgrade := strings.ToLower(r.Request.Header.Get("Upgrade"))
@@ -142,7 +142,7 @@ func pipe_std_ws_server(config ConfigServer, credentialdb *gorm.DB, tokendb *gor
 	for _, serverconfig := range config.Servers {
 
 		tasks = append(tasks, createTaskServer(serverconfig,
-			handler, middlewares...))
+			append(middlewares, handler)...))
 	}
 	// 启动服务器
 	result, ok := PromiseAll(tasks).Receive()