zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor ngin to rest

Browse Source
This commit is contained in:
kim
2020-07-31 17:03:19 +08:00
parent b73684d9a6
commit cf8e0a118f
10 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/goctl/api/gogen/genroutes.go
View File

@@ -2,7 +2,6 @@ package gogen
import (
"bytes"
"errors"
"fmt"
"path"
"sort"
@@ -26,7 +25,7 @@ import (
{{.importPackages}}
)
func RegisterHandlers(engine *rest.Engine, serverCtx *svc.ServiceContext) {
func RegisterHandlers(engine *rest.Server, serverCtx *svc.ServiceContext) {
{{.routesAdditions}}
}
`
@@ -80,11 +79,11 @@ func genRoutes(dir string, api *spec.ApiSpec) error {
}
jwt := ""
if g.jwtEnabled {
jwt = fmt.Sprintf(", rest.WithJwt(serverCtx.Config.%s.AccessSecret)", g.authName)
jwt = fmt.Sprintf(", ngin.WithJwt(serverCtx.Config.%s.AccessSecret)", g.authName)
}
signature := ""
if g.signatureEnabled {
signature = fmt.Sprintf(", rest.WithSignature(serverCtx.Config.%s.Signature)", g.authName)
signature = fmt.Sprintf(", ngin.WithSignature(serverCtx.Config.%s.Signature)", g.authName)
}
if err := gt.Execute(&builder, map[string]string{
"routes": strings.TrimSpace(gbuilder.String()),
@@ -175,17 +174,6 @@ func getRoutes(api *spec.ApiSpec) ([]group, error) {
handler: handler,
})
}
if value, ok := apiutil.GetAnnotationValue(g.Annotations, "server", "jwt"); ok {
groupedRoutes.authName = value
groupedRoutes.jwtEnabled = true
}
if value, ok := apiutil.GetAnnotationValue(g.Annotations, "server", "signature"); ok {
if groupedRoutes.authName != "" && groupedRoutes.authName != value {
return nil, errors.New("auth signature should config same")
}
groupedRoutes.signatureEnabled = true
}
routes = append(routes, groupedRoutes)
}