Skip to content

Commit 3d8e6e7

Browse files
jaronniejaronnie
committed
feat(server): use compact_handler gen code
1 parent c8536b1 commit 3d8e6e7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+667
-1429
lines changed

‎server/desc/api/auth/auth.api

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@ type ResetPasswordRequest {
7171
type ResetPasswordResponse {}
7272

7373
@server (
74-
prefix: /api
75-
group: auth
74+
prefix: /api
75+
group: auth
76+
compact_handler: true
7677
)
7778
service server {
7879
@handler PwdLogin
@@ -95,9 +96,10 @@ service server {
9596
}
9697

9798
@server (
98-
prefix: /api
99-
group: auth
100-
jwt: Jwt
99+
prefix: /api
100+
group: auth
101+
compact_handler: true
102+
jwt: Jwt
101103
)
102104
service server {
103105
@handler GetUserInfo

‎server/desc/api/manage/menu.api

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,11 @@ type EditRequest {
133133
type EditResponse {}
134134

135135
@server (
136-
prefix: /api
137-
group: manage/menu
138-
jwt: Jwt
139-
middleware: Authx
136+
prefix: /api
137+
group: manage/menu
138+
compact_handler: true
139+
jwt: Jwt
140+
middleware: Authx
140141
)
141142
service server {
142143
@handler List

‎server/desc/api/manage/role.api

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,11 @@ type GetHomeRequest {
8989
}
9090

9191
@server (
92-
prefix: /api
93-
group: manage/role
94-
jwt: Jwt
95-
middleware: Authx
92+
prefix: /api
93+
group: manage/role
94+
compact_handler: true
95+
jwt: Jwt
96+
middleware: Authx
9697
)
9798
service server {
9899
@handler List

‎server/desc/api/manage/user.api

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,11 @@ type DeleteRequest {
7070
type DeleteResponse {}
7171

7272
@server (
73-
prefix: /api
74-
group: manage/user
75-
jwt: Jwt
76-
middleware: Authx
73+
prefix: /api
74+
group: manage/user
75+
compact_handler: true
76+
jwt: Jwt
77+
middleware: Authx
7778
)
7879
service server {
7980
@handler List

‎server/desc/api/route/route.api

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ type GetUserRoutesResponse {
5757
type IsRouteExistRequest {}
5858

5959
@server (
60-
prefix: /api
61-
group: route
62-
jwt: Jwt
60+
prefix: /api
61+
group: route
62+
compact_handler: true
63+
jwt: Jwt
6364
)
6465
service server {
6566
@handler GetUserRoutes
@@ -70,8 +71,9 @@ service server {
7071
}
7172

7273
@server (
73-
prefix: /api
74-
group: route
74+
prefix: /api
75+
group: route
76+
compact_handler: true
7577
)
7678
service server {
7779
@handler GetConstantRoutes

‎server/desc/api/version.api

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ info (
44
go_package: "version"
55
)
66

7-
type GetRequest {}
7+
type VersionRequest {}
88

9-
type GetResponse {
9+
type VersionResponse {
1010
Version string `json:"version"`
1111
GoVersion string `json:"goVersion"`
1212
Commit string `json:"commit"`
@@ -18,7 +18,7 @@ type GetResponse {
1818
group: version
1919
)
2020
service server {
21-
@handler Get
22-
get /version (GetRequest) returns (GetResponse)
21+
@handler Version
22+
get /version (VersionRequest) returns (VersionResponse)
2323
}
2424

‎server/internal/handler/auth/auth.go

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
package auth
2+
3+
import (
4+
"github.com/jzero-io/jzero-admin/server/internal/logic/auth"
5+
"github.com/jzero-io/jzero-admin/server/internal/svc"
6+
types "github.com/jzero-io/jzero-admin/server/internal/types/auth"
7+
"github.com/zeromicro/go-zero/rest/httpx"
8+
"net/http"
9+
)
10+
11+
func CodeLogin(svcCtx *svc.ServiceContext) http.HandlerFunc {
12+
return func(w http.ResponseWriter, r *http.Request) {
13+
var req types.CodeLoginRequest
14+
if err := httpx.Parse(r, &req); err != nil {
15+
httpx.ErrorCtx(r.Context(), w, err)
16+
return
17+
}
18+
19+
l := auth.NewCodeLogin(r.Context(), svcCtx, r)
20+
resp, err := l.CodeLogin(&req)
21+
if err != nil {
22+
httpx.ErrorCtx(r.Context(), w, err)
23+
} else {
24+
httpx.OkJsonCtx(r.Context(), w, resp)
25+
}
26+
}
27+
}
28+
29+
func PwdLogin(svcCtx *svc.ServiceContext) http.HandlerFunc {
30+
return func(w http.ResponseWriter, r *http.Request) {
31+
var req types.PwdLoginRequest
32+
if err := httpx.Parse(r, &req); err != nil {
33+
httpx.ErrorCtx(r.Context(), w, err)
34+
return
35+
}
36+
37+
l := auth.NewPwdLogin(r.Context(), svcCtx, r)
38+
resp, err := l.PwdLogin(&req)
39+
if err != nil {
40+
httpx.ErrorCtx(r.Context(), w, err)
41+
} else {
42+
httpx.OkJsonCtx(r.Context(), w, resp)
43+
}
44+
}
45+
}
46+
47+
func RefreshToken(svcCtx *svc.ServiceContext) http.HandlerFunc {
48+
return func(w http.ResponseWriter, r *http.Request) {
49+
var req types.RefreshTokenRequest
50+
if err := httpx.Parse(r, &req); err != nil {
51+
httpx.ErrorCtx(r.Context(), w, err)
52+
return
53+
}
54+
55+
l := auth.NewRefreshToken(r.Context(), svcCtx, r)
56+
resp, err := l.RefreshToken(&req)
57+
if err != nil {
58+
httpx.ErrorCtx(r.Context(), w, err)
59+
} else {
60+
httpx.OkJsonCtx(r.Context(), w, resp)
61+
}
62+
}
63+
}
64+
65+
func Register(svcCtx *svc.ServiceContext) http.HandlerFunc {
66+
return func(w http.ResponseWriter, r *http.Request) {
67+
var req types.RegisterRequest
68+
if err := httpx.Parse(r, &req); err != nil {
69+
httpx.ErrorCtx(r.Context(), w, err)
70+
return
71+
}
72+
73+
l := auth.NewRegister(r.Context(), svcCtx, r)
74+
resp, err := l.Register(&req)
75+
if err != nil {
76+
httpx.ErrorCtx(r.Context(), w, err)
77+
} else {
78+
httpx.OkJsonCtx(r.Context(), w, resp)
79+
}
80+
}
81+
}
82+
83+
func ResetPassword(svcCtx *svc.ServiceContext) http.HandlerFunc {
84+
return func(w http.ResponseWriter, r *http.Request) {
85+
var req types.ResetPasswordRequest
86+
if err := httpx.Parse(r, &req); err != nil {
87+
httpx.ErrorCtx(r.Context(), w, err)
88+
return
89+
}
90+
91+
l := auth.NewResetPassword(r.Context(), svcCtx, r)
92+
resp, err := l.ResetPassword(&req)
93+
if err != nil {
94+
httpx.ErrorCtx(r.Context(), w, err)
95+
} else {
96+
httpx.OkJsonCtx(r.Context(), w, resp)
97+
}
98+
}
99+
}
100+
101+
func SendVerificationCode(svcCtx *svc.ServiceContext) http.HandlerFunc {
102+
return func(w http.ResponseWriter, r *http.Request) {
103+
var req types.SendVerificationCodeRequest
104+
if err := httpx.Parse(r, &req); err != nil {
105+
httpx.ErrorCtx(r.Context(), w, err)
106+
return
107+
}
108+
109+
l := auth.NewSendVerificationCode(r.Context(), svcCtx, r)
110+
resp, err := l.SendVerificationCode(&req)
111+
if err != nil {
112+
httpx.ErrorCtx(r.Context(), w, err)
113+
} else {
114+
httpx.OkJsonCtx(r.Context(), w, resp)
115+
}
116+
}
117+
}
118+
119+
func Error(svcCtx *svc.ServiceContext) http.HandlerFunc {
120+
return func(w http.ResponseWriter, r *http.Request) {
121+
var req types.ErrorRequest
122+
if err := httpx.Parse(r, &req); err != nil {
123+
httpx.ErrorCtx(r.Context(), w, err)
124+
return
125+
}
126+
127+
l := auth.NewError(r.Context(), svcCtx, r)
128+
resp, err := l.Error(&req)
129+
if err != nil {
130+
httpx.ErrorCtx(r.Context(), w, err)
131+
} else {
132+
httpx.OkJsonCtx(r.Context(), w, resp)
133+
}
134+
}
135+
}
136+
137+
func GetUserInfo(svcCtx *svc.ServiceContext) http.HandlerFunc {
138+
return func(w http.ResponseWriter, r *http.Request) {
139+
var req types.GetUserInfoRequest
140+
if err := httpx.Parse(r, &req); err != nil {
141+
httpx.ErrorCtx(r.Context(), w, err)
142+
return
143+
}
144+
145+
l := auth.NewGetUserInfo(r.Context(), svcCtx, r)
146+
resp, err := l.GetUserInfo(&req)
147+
if err != nil {
148+
httpx.ErrorCtx(r.Context(), w, err)
149+
} else {
150+
httpx.OkJsonCtx(r.Context(), w, resp)
151+
}
152+
}
153+
}

‎server/internal/handler/auth/code_login.go

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎server/internal/handler/auth/error.go

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎server/internal/handler/auth/get_user_info.go

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)