fix

pubgo · Feb 16, 2024 · dd2603d · dd2603d
1 parent 0886dc9
commit dd2603d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 30 deletions.
diff --git a/docs/docs.go b/docs/docs.go
@@ -9,3 +9,4 @@ package templates
 // https://github.com/long2ice/swagin
 // https://github.com/long2ice/fibers
 // https://github.com/getkin/kin-openapi
+// https://github.com/danielgtaylor/huma
diff --git a/internal/examples/main.go b/internal/examples/main.go
@@ -1,11 +1,12 @@
 package main
 
 import (
+	"os"
+
 	"github.com/pubgo/funk/assert"
 	"github.com/pubgo/funk/recovery"
 	"github.com/pubgo/opendoc/opendoc"
 	"github.com/pubgo/opendoc/security"
-	"os"
 )
 
 type TestQueryReqAAA struct {

diff --git a/opendoc/util.go b/opendoc/util.go
@@ -2,7 +2,6 @@ package opendoc
 
 import (
 	"fmt"
-	"github.com/pubgo/funk/log"
 	"mime/multipart"
 	"net"
 	"net/http"
@@ -15,6 +14,7 @@ import (
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/goccy/go-json"
 	"github.com/pubgo/funk/assert"
+	"github.com/pubgo/funk/log"
 	"github.com/pubgo/opendoc/security"
 	"k8s.io/kube-openapi/pkg/util"
 )
@@ -38,7 +38,7 @@ func checkModelType(model interface{}) {
 		t = t.Elem()
 	}
 
-	assert.If(t.Kind() != reflect.Struct, "The native type of val should be struct")
+	assert.If(t.Kind() != reflect.Struct, "The native type of model should be struct")
 }
 
 func getSchemaName(val interface{}) string {
@@ -70,7 +70,7 @@ func getCanonicalTypeName(val interface{}) string {
 		path = path[strings.Index(path, "/vendor/")+len("/vendor/"):]
 	}
 
-	path = strings.TrimPrefix(path, "vendor/")
+	path = strings.Trim(strings.TrimPrefix(path, "vendor"), "/")
 	return path + "." + model.Name()
 }
 
@@ -198,8 +198,7 @@ func genSchema(val interface{}) (ref string, schema *openapi3.Schema) {
 			getTag(tags, deprecated, func(tag *structtag.Tag) { fieldSchema.Deprecated = true })
 			getTag(tags, defaultName, func(tag *structtag.Tag) { fieldSchema.Default = tag.Name })
 			getTag(tags, example, func(tag *structtag.Tag) {
-				err = json.Unmarshal([]byte(tag.Value()), &fieldSchema.Example)
-				if err != nil {
+				if err := json.Unmarshal([]byte(tag.Value()), &fieldSchema.Example); err != nil {
 					log.Err(err).Str("tag-value", tag.Value()).Msg("failed to unmarshal example")
 				}
 			})

diff --git a/templates/template.go b/templates/template.go
@@ -2,7 +2,6 @@ package templates
 
 import (
 	_ "embed"
-	"fmt"
 	"html/template"
 	"net/http"
 
@@ -18,29 +17,6 @@ var swaggerFile string
 var reDocTemplate = assert.Exit1(template.New("").Parse(reDocFile))
 var swaggerTemplate = assert.Exit1(template.New("").Parse(swaggerFile))
 
-func RapiDocHandler(title, url string) http.HandlerFunc {
-	return func(writer http.ResponseWriter, request *http.Request) {
-		writer.Header().Set("Content-Type", "text/html")
-		writer.Write([]byte(fmt.Sprintf(`<!doctype html>
-<html>
-<head>
-	<title>%s</title>
-  <meta charset="utf-8">
-  <script type="module" src="https://unpkg.com/[email protected]/dist/rapidoc-min.js"></script>
-</head>
-<body>
-  <rapi-doc
-		spec-url="%s"
-		render-style="read"
-    show-header="false"
-    primary-color="#f74799"
-    nav-accent-color="#47afe8"
-  > </rapi-doc>
-</body>
-</html>`, title, url)))
-	}
-}
-
 func ReDocHandler(title, url string) http.HandlerFunc {
 	return func(writer http.ResponseWriter, request *http.Request) {
 		writer.Header().Set("Content-Type", "text/html")