Skip to content

Commit 4fea8a1

Browse files
JingYiJunJingYiJun
committed
feat: many updates:
update all Validate syntax; replace all fmt.Print and log.Print with zerolog; replace CustomTime use common version update dependencies; add Aliyun ACR as image repo
1 parent 6aa9077 commit 4fea8a1

File tree

35 files changed

+269
-327
lines changed

35 files changed

+269
-327
lines changed

‎.github/workflows/dev-v2.1.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,18 @@ jobs:
3030
with:
3131
username: ${{ secrets.DOCKERHUB_USERNAME }}
3232
password: ${{ secrets.DOCKERHUB_TOKEN }}
33+
- name: Login to Aliyun ACR
34+
uses: docker/login-action@master
35+
with:
36+
registry: registry.cn-shanghai.aliyuncs.com
37+
username: ${{ secrets.ACR_USERNAME }}
38+
password: ${{ secrets.ACR_PASSWORD }}
3339
- name: Build and push
3440
id: docker_build
3541
uses: docker/build-push-action@master
3642
with:
3743
push: true
3844
tags: |
3945
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.APP_NAME }}:dev-v2.1
46+
registry.cn-shanghai.aliyuncs.com/${{ secrets.ACR_NAMESPACE }}/${{ env.APP_NAME }}:dev-v2.1
4047

‎.github/workflows/dev.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ jobs:
3030
with:
3131
username: ${{ secrets.DOCKERHUB_USERNAME }}
3232
password: ${{ secrets.DOCKERHUB_TOKEN }}
33+
- name: Login to Aliyun ACR
34+
uses: docker/login-action@master
35+
with:
36+
registry: registry.cn-shanghai.aliyuncs.com
37+
username: ${{ secrets.ACR_USERNAME }}
38+
password: ${{ secrets.ACR_PASSWORD }}
3339
- name: Build and push
3440
id: docker_build
3541
uses: docker/build-push-action@master
@@ -38,4 +44,6 @@ jobs:
3844
tags: |
3945
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.APP_NAME }}:latest
4046
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.APP_NAME }}:dev
47+
registry.cn-shanghai.aliyuncs.com/${{ secrets.ACR_NAMESPACE }}/${{ env.APP_NAME }}:dev
48+
registry.cn-shanghai.aliyuncs.com/${{ secrets.ACR_NAMESPACE }}/${{ env.APP_NAME }}:latest
4149

‎.github/workflows/main.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ jobs:
3030
with:
3131
username: ${{ secrets.DOCKERHUB_USERNAME }}
3232
password: ${{ secrets.DOCKERHUB_TOKEN }}
33+
- name: Login to Aliyun ACR
34+
uses: docker/login-action@master
35+
with:
36+
registry: registry.cn-shanghai.aliyuncs.com
37+
username: ${{ secrets.ACR_USERNAME }}
38+
password: ${{ secrets.ACR_PASSWORD }}
3339
- name: Build and push
3440
id: docker_build
3541
uses: docker/build-push-action@master
@@ -38,4 +44,6 @@ jobs:
3844
tags: |
3945
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.APP_NAME }}:latest
4046
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.APP_NAME }}:master
47+
registry.cn-shanghai.aliyuncs.com/${{ secrets.ACR_NAMESPACE }}/${{ env.APP_NAME }}:master
48+
registry.cn-shanghai.aliyuncs.com/${{ secrets.ACR_NAMESPACE }}/${{ env.APP_NAME }}:latest
4149

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
*.ps1
77
*.log
88
*.out
9+
*.http

‎apis/division/apis.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ import (
2323
// @Success 200 {object} models.Division
2424
func AddDivision(c *fiber.Ctx) error {
2525
// validate body
26-
body, err := common.ValidateBody[CreateModel](c)
26+
var body CreateModel
27+
err := common.ValidateBody(c, &body)
2728
if err != nil {
2829
return err
2930
}
@@ -92,7 +93,8 @@ func GetDivision(c *fiber.Ctx) error {
9293
// @Failure 404 {object} MessageModel
9394
func ModifyDivision(c *fiber.Ctx) error {
9495
// validate body
95-
body, err := common.ValidateBody[ModifyModel](c)
96+
var body ModifyModel
97+
err := common.ValidateBody(c, &body)
9698
if err != nil {
9799
return err
98100
}
@@ -141,7 +143,8 @@ func ModifyDivision(c *fiber.Ctx) error {
141143
// @Failure 404 {object} MessageModel
142144
func DeleteDivision(c *fiber.Ctx) error {
143145
// validate body
144-
body, err := common.ValidateBody[DeleteModel](c)
146+
var body DeleteModel
147+
err := common.ValidateBody(c, &body)
145148
if err != nil {
146149
return err
147150
}

‎apis/favourite/api.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ func ListFavorites(c *fiber.Ctx) error {
2626
return err
2727
}
2828

29-
query, err := common.ValidateQuery[ListModel](c)
29+
var query ListModel
30+
err = common.ValidateQuery(c, &query)
3031
if err != nil {
3132
return err
3233
}
@@ -74,7 +75,8 @@ func ListFavorites(c *fiber.Ctx) error {
7475
// @Success 200 {object} Response
7576
func AddFavorite(c *fiber.Ctx) error {
7677
// validate body
77-
body, err := common.ValidateBody[AddModel](c)
78+
var body AddModel
79+
err := common.ValidateBody(c, &body)
7880
if err != nil {
7981
return err
8082
}
@@ -119,7 +121,8 @@ func AddFavorite(c *fiber.Ctx) error {
119121
// @Failure 404 {object} Response
120122
func ModifyFavorite(c *fiber.Ctx) error {
121123
// validate body
122-
body, err := common.ValidateBody[ModifyModel](c)
124+
var body ModifyModel
125+
err := common.ValidateBody(c, &body)
123126
if err != nil {
124127
return err
125128
}
@@ -159,7 +162,8 @@ func ModifyFavorite(c *fiber.Ctx) error {
159162
// @Failure 404 {object} Response
160163
func DeleteFavorite(c *fiber.Ctx) error {
161164
// validate body
162-
body, err := common.ValidateBody[DeleteModel](c)
165+
var body DeleteModel
166+
err := common.ValidateBody(c, &body)
163167
if err != nil {
164168
return err
165169
}

‎apis/floor/apis.go‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ func ListFloorsInAHole(c *fiber.Ctx) error {
3030
return err
3131
}
3232

33-
query, err := common.ValidateQuery[ListModel](c)
33+
var query ListModel
34+
err = common.ValidateQuery(c, &query)
3435
if err != nil {
3536
return err
3637
}
@@ -60,13 +61,14 @@ func ListFloorsInAHole(c *fiber.Ctx) error {
6061
// @Success 200 {array} Floor
6162
func ListFloorsOld(c *fiber.Ctx) error {
6263
// validate
63-
query, err := common.ValidateQuery[ListOldModel](c)
64+
var query ListOldModel
65+
err := common.ValidateQuery(c, &query)
6466
if err != nil {
6567
return err
6668
}
6769

6870
if query.Search != "" {
69-
return SearchFloorsOld(c, query)
71+
return SearchFloorsOld(c, &query)
7072
}
7173

7274
var querySet *gorm.DB
@@ -128,7 +130,8 @@ func GetFloor(c *fiber.Ctx) error {
128130
// @Param json body CreateModel true "json"
129131
// @Success 201 {object} Floor
130132
func CreateFloor(c *fiber.Ctx) error {
131-
body, err := common.ValidateBody[CreateModel](c)
133+
var body CreateModel
134+
err := common.ValidateBody(c, &body)
132135
if err != nil {
133136
return err
134137
}
@@ -192,7 +195,8 @@ func CreateFloor(c *fiber.Ctx) error {
192195
// @Param json body CreateOldModel true "json"
193196
// @Success 201 {object} CreateOldResponse
194197
func CreateFloorOld(c *fiber.Ctx) error {
195-
body, err := common.ValidateBody[CreateOldModel](c)
198+
var body CreateOldModel
199+
err := common.ValidateBody(c, &body)
196200
if err != nil {
197201
return err
198202
}
@@ -255,7 +259,8 @@ func CreateFloorOld(c *fiber.Ctx) error {
255259
// @Failure 404 {object} MessageModel
256260
func ModifyFloor(c *fiber.Ctx) error {
257261
// validate request body
258-
body, err := common.ValidateBody[ModifyModel](c)
262+
var body ModifyModel
263+
err := common.ValidateBody(c, &body)
259264
if err != nil {
260265
return err
261266
}
@@ -473,7 +478,8 @@ func ModifyFloorLike(c *fiber.Ctx) error {
473478
// @Failure 404 {object} MessageModel
474479
func DeleteFloor(c *fiber.Ctx) error {
475480
// validate body
476-
body, err := common.ValidateBody[DeleteModel](c)
481+
var body DeleteModel
482+
err := common.ValidateBody(c, &body)
477483
if err != nil {
478484
return err
479485
}
@@ -581,7 +587,8 @@ func GetFloorHistory(c *fiber.Ctx) error {
581587
// @Failure 404 {object} MessageModel
582588
func RestoreFloor(c *fiber.Ctx) error {
583589
// validate body
584-
body, err := common.ValidateBody[RestoreModel](c)
590+
var body RestoreModel
591+
err := common.ValidateBody(c, &body)
585592
if err != nil {
586593
return err
587594
}

‎apis/floor/search.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ type SearchQuery struct {
2323
// @Param object query SearchQuery true "search_query"
2424
// @Success 200 {array} models.Floor
2525
func SearchFloors(c *fiber.Ctx) error {
26-
query, err := common.ValidateQuery[SearchQuery](c)
26+
var query SearchQuery
27+
err := common.ValidateQuery(c, &query)
2728
if err != nil {
2829
return err
2930
}

‎apis/hole/apis.go‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import (
2424
// @Failure 404 {object} MessageModel
2525
// @Failure 500 {object} MessageModel
2626
func ListHolesByDivision(c *fiber.Ctx) error {
27-
query, err := common.ValidateQuery[QueryTime](c)
27+
var query QueryTime
28+
err := common.ValidateQuery(c, &query)
2829
if err != nil {
2930
return err
3031
}
@@ -58,7 +59,8 @@ func ListHolesByDivision(c *fiber.Ctx) error {
5859
// @Success 200 {array} Hole
5960
// @Failure 404 {object} MessageModel
6061
func ListHolesByTag(c *fiber.Ctx) error {
61-
query, err := common.ValidateQuery[QueryTime](c)
62+
var query QueryTime
63+
err := common.ValidateQuery(c, &query)
6264
if err != nil {
6365
return err
6466
}
@@ -95,7 +97,8 @@ func ListHolesByTag(c *fiber.Ctx) error {
9597
// @Param object query QueryTime false "query"
9698
// @Success 200 {array} Hole
9799
func ListHolesByMe(c *fiber.Ctx) error {
98-
query, err := common.ValidateQuery[QueryTime](c)
100+
var query QueryTime
101+
err := common.ValidateQuery(c, &query)
99102
if err != nil {
100103
return err
101104
}
@@ -126,7 +129,8 @@ func ListHolesByMe(c *fiber.Ctx) error {
126129
// @Param object query ListOldModel false "query"
127130
// @Success 200 {array} Hole
128131
func ListHolesOld(c *fiber.Ctx) error {
129-
query, err := common.ValidateQuery[ListOldModel](c)
132+
var query ListOldModel
133+
err := common.ValidateQuery(c, &query)
130134
if err != nil {
131135
return err
132136
}
@@ -198,7 +202,8 @@ func GetHole(c *fiber.Ctx) error {
198202
// @Success 201 {object} Hole
199203
func CreateHole(c *fiber.Ctx) error {
200204
// validate body
201-
body, err := common.ValidateBody[CreateModel](c)
205+
var body CreateModel
206+
err := common.ValidateBody(c, &body)
202207
if err != nil {
203208
return err
204209
}
@@ -247,7 +252,8 @@ func CreateHole(c *fiber.Ctx) error {
247252
// @Success 201 {object} CreateOldResponse
248253
func CreateHoleOld(c *fiber.Ctx) error {
249254
// validate body
250-
body, err := common.ValidateBody[CreateOldModel](c)
255+
var body CreateOldModel
256+
err := common.ValidateBody(c, &body)
251257
if err != nil {
252258
return err
253259
}
@@ -296,7 +302,8 @@ func CreateHoleOld(c *fiber.Ctx) error {
296302
// @Failure 404 {object} MessageModel
297303
func ModifyHole(c *fiber.Ctx) error {
298304
// validate
299-
body, err := common.ValidateBody[ModifyModel](c)
305+
var body ModifyModel
306+
err := common.ValidateBody(c, &body)
300307
if err != nil {
301308
return err
302309
}

‎apis/hole/schemas.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ import (
1010
type QueryTime struct {
1111
Size int `json:"size" query:"size" default:"10" validate:"max=10"`
1212
// updated time < offset (default is now)
13-
Offset models.CustomTime `json:"offset" query:"offset" swaggertype:"string"`
13+
Offset common.CustomTime `json:"offset" query:"offset" swaggertype:"string"`
1414
Order string `json:"order" query:"order"`
1515
}
1616

1717
func (q *QueryTime) SetDefaults() {
1818
if q.Offset.IsZero() {
19-
q.Offset = models.CustomTime{Time: time.Now()}
19+
q.Offset = common.CustomTime{Time: time.Now()}
2020
}
2121
}
2222

2323
type ListOldModel struct {
24-
Offset models.CustomTime `json:"start_time" query:"start_time" swaggertype:"string"`
24+
Offset common.CustomTime `json:"start_time" query:"start_time" swaggertype:"string"`
2525
Size int `json:"length" query:"length" default:"10" validate:"max=10" `
2626
Tag string `json:"tag" query:"tag"`
2727
DivisionID int `json:"division_id" query:"division_id"`
@@ -30,7 +30,7 @@ type ListOldModel struct {
3030

3131
func (q *ListOldModel) SetDefaults() {
3232
if q.Offset.IsZero() {
33-
q.Offset = models.CustomTime{Time: time.Now()}
33+
q.Offset = common.CustomTime{Time: time.Now()}
3434
}
3535
}
3636

0 commit comments

Comments
 (0)