Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optimized generator formatted code #148

Merged
merged 30 commits into from
Oct 20, 2020
Merged

optimized generator formatted code #148

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
8873d1d
rebase upstream
Sep 1, 2020
1dacf3f
rebase
Sep 1, 2020
acf48aa
trim no need line
Sep 1, 2020
044bfbc
trim no need line
Sep 1, 2020
72d7f75
trim no need line
Sep 1, 2020
cb38f4a
update doc
kingxt Sep 11, 2020
9a21c02
remove update
kingxt Sep 11, 2020
e7a35bc
remove no need
kingxt Sep 21, 2020
8884919
remove no need
kingxt Sep 21, 2020
277d2f6
goctl add jwt support
kingxt Sep 21, 2020
6993309
goctl add jwt support
kingxt Sep 21, 2020
689a0b2
goctl add jwt support
kingxt Sep 21, 2020
80faa56
goctl support import
kingxt Sep 22, 2020
c28c5fe
goctl support import
kingxt Sep 22, 2020
7b12934
support return ()
kingxt Sep 27, 2020
b2768b8
revert
kingxt Sep 27, 2020
924a3a2
refactor and rename folder to group
kingxt Sep 29, 2020
9d7af11
remove no need
kingxt Oct 16, 2020
d16a654
add anonymous annotation
kingxt Oct 16, 2020
21995ac
optimized
kingxt Oct 16, 2020
ee0c0e1
rename
kingxt Oct 16, 2020
7372933
rename
kingxt Oct 16, 2020
0b45b3c
update test
kingxt Oct 16, 2020
ccc6d51
api add middleware support: usage:
kingxt Oct 19, 2020
9031ae2
api add middleware support: usage:
kingxt Oct 19, 2020
cf1e96d
simple logic
kingxt Oct 19, 2020
cb6f180
optimized
kingxt Oct 19, 2020
d88c230
optimized generator formatted code
kingxt Oct 20, 2020
e789234
optimized generator formatted code
kingxt Oct 20, 2020
f43227a
add more test
kingxt Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
optimized generator formatted code
  • Loading branch information
@kingxt
kingxt committed Oct 20, 2020
commit e7892346880a86a0c300f6d16ab1854ed71c52cd
6 changes: 5 additions & 1 deletion tools/goctl/api/gogen/genroutes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,17 @@ func genRoutes(dir string, api *spec.ApiSpec, force bool) error {
gt := template.Must(template.New("groupTemplate").Parse(routesAdditionTemplate))
for _, g := range groups {
var gbuilder strings.Builder
gbuilder.WriteString("[]rest.Route{")
for _, r := range g.routes {
fmt.Fprintf(&gbuilder, `
Route{
{
Method: %s,
Path: "%s",
Handler: %s,
},`,
r.method, r.path, r.handler)
}

var jwt string
if g.jwtEnabled {
jwt = fmt.Sprintf("\n rest.WithJwt(serverCtx.Config.%s.AccessSecret),", g.authName)
Expand All @@ -91,6 +93,7 @@ func genRoutes(dir string, api *spec.ApiSpec, force bool) error {

var routes string
if len(g.middleware) > 0 {
gbuilder.WriteString("\n}...,")
var params = g.middleware
for i := range params {
params[i] = "serverCtx." + params[i]
Expand All @@ -99,6 +102,7 @@ func genRoutes(dir string, api *spec.ApiSpec, force bool) error {
routes = fmt.Sprintf("rest.WithMiddlewares(\n[]rest.Middleware{ %s }, \n %s \n),",
middlewareStr, strings.TrimSpace(gbuilder.String()))
} else {
gbuilder.WriteString("\n},")
routes = strings.TrimSpace(gbuilder.String())
}

Expand Down