diff --git a/restagent/restagent.go b/restagent/restagent.go index d33342ed..822b0ab9 100644 --- a/restagent/restagent.go +++ b/restagent/restagent.go @@ -24,6 +24,7 @@ import ( libSession "ems.agt/src/lib_features/session" "github.com/gin-gonic/gin" "golang.org/x/net/http2" + "golang.org/x/net/http2/h2c" ) // const defaultConfigFile = "./etc/restconf.yaml" @@ -70,18 +71,21 @@ import ( func HttpListen(addr string, router http.Handler) { // 创建HTTP服务器 + h2s := &http2.Server{ + // ... + } server := &http.Server{ Addr: addr, - Handler: router, + Handler: h2c.NewHandler(router, h2s), } - // support http 2.0 server - err := http2.ConfigureServer(server, &http2.Server{}) - if err != nil { - fmt.Println("ConfigureServer err:", err) - os.Exit(11) - } - err = server.ListenAndServe() + // // support http 2.0 server + // err := http2.ConfigureServer(server, &http2.Server{}) + // if err != nil { + // fmt.Println("ConfigureServer err:", err) + // os.Exit(11) + // } + err := server.ListenAndServe() if err != nil { fmt.Println("ListenAndServe err:", err) os.Exit(12) @@ -162,18 +166,26 @@ func HttpListenWebServerTLS(addr, caFile, certFile, keyFile string, clientAuthTy } func HttpListenWebServer(addr string) { - // 创建HTTP服务器 - server := &http.Server{ - Addr: addr, - } - // support http 2.0 server - err := http2.ConfigureServer(server, &http2.Server{}) - if err != nil { - fmt.Println("ConfigureServer err:", err) - os.Exit(7) + h2s := &http2.Server{ + // ... } - err = server.ListenAndServe() + server := &http.Server{ + Addr: addr, + Handler: h2c.NewHandler(nil, h2s), + } + // // 创建HTTP服务器 + // server := &http.Server{ + // Addr: addr, + // } + + // // support http 2.0 server + // err := http2.ConfigureServer(server, &http2.Server{}) + // if err != nil { + // fmt.Println("ConfigureServer err:", err) + // os.Exit(7) + // } + err := server.ListenAndServe() if err != nil { fmt.Println("ListenAndServe err:", err) os.Exit(8)