From 96a135834a028b4ffabc216c0fe2e77e58e458fd Mon Sep 17 00:00:00 2001
From: John Guo <john@johng.cn>
Date: Thu, 24 Mar 2022 20:15:54 +0800
Subject: [PATCH] improve openapi genereating for package ghttp

---
 example/go.sum                    |  5 ++++
 net/ghttp/ghttp_server_openapi.go | 47 ++++++++++++++++++++-----------
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/example/go.sum b/example/go.sum
index 65e14ee12..0de41ebbb 100644
--- a/example/go.sum
+++ b/example/go.sum
@@ -76,6 +76,7 @@ github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfC
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogf/katyusha v0.3.0/go.mod h1:AknlfKGS7HjZfLiz74Nd/eL2uq7bg+9aucZgfvXw8vQ=
 github.com/gogf/katyusha v0.3.1-0.20220128101623-e25b27a99b29 h1:s28bNu6QekQG3XFFB3G6YV3AGvQz8Uj4lBu/WXIeF28=
@@ -114,6 +115,8 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grokify/html-strip-tags-go v0.0.1 h1:0fThFwLbW7P/kOiTBs03FsJSV9RM2M/Q/MOnCQxKMo0=
 github.com/grokify/html-strip-tags-go v0.0.1/go.mod h1:2Su6romC5/1VXOQMaWL2yb618ARB8iVo6/DR99A6d78=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
@@ -135,6 +138,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/longbridgeapp/sqlparser v0.3.1 h1:iWOZWGIFgQrJRgobLXUNJdvqGRpbVXkyKUKUA5CNJBE=
+github.com/longbridgeapp/sqlparser v0.3.1/go.mod h1:GIHaUq8zvYyHLCLMJJykx1CdM6LHtkUih/QaJXySSx4=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
diff --git a/net/ghttp/ghttp_server_openapi.go b/net/ghttp/ghttp_server_openapi.go
index 035063f04..b939171e0 100644
--- a/net/ghttp/ghttp_server_openapi.go
+++ b/net/ghttp/ghttp_server_openapi.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/gogf/gf/v2/internal/intlog"
 	"github.com/gogf/gf/v2/protocol/goai"
+	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
 )
 
@@ -24,23 +25,35 @@ func (s *Server) initOpenApi() {
 		err    error
 		method string
 	)
-	for _, item := range s.GetRoutes() {
-		switch item.Type {
-		case HandlerTypeMiddleware, HandlerTypeHook:
-			continue
-		}
-		method = item.Method
-		if gstr.Equal(method, defaultMethod) {
-			method = ""
-		}
-		if item.Handler.Info.Func == nil {
-			err = s.openapi.Add(goai.AddInput{
-				Path:   item.Route,
-				Method: method,
-				Object: item.Handler.Info.Value.Interface(),
-			})
-			if err != nil {
-				s.Logger().Fatalf(ctx, `%+v`, err)
+	for routeKey, registeredItems := range s.routesMap {
+		array, _ := gregex.MatchString(`(.*?)%([A-Z]+):(.+)@(.+)`, routeKey)
+		for _, registeredItem := range registeredItems {
+			item := RouterItem{
+				Server:     s.config.Name,
+				Domain:     array[4],
+				Type:       registeredItem.Handler.Type,
+				Middleware: array[1],
+				Method:     array[2],
+				Route:      array[3],
+				Handler:    registeredItem.Handler,
+			}
+			switch item.Type {
+			case HandlerTypeMiddleware, HandlerTypeHook:
+				continue
+			}
+			method = item.Method
+			if gstr.Equal(method, defaultMethod) {
+				method = ""
+			}
+			if item.Handler.Info.Func == nil {
+				err = s.openapi.Add(goai.AddInput{
+					Path:   item.Route,
+					Method: method,
+					Object: item.Handler.Info.Value.Interface(),
+				})
+				if err != nil {
+					s.Logger().Fatalf(ctx, `%+v`, err)
+				}
 			}
 		}
 	}