Skip to content
This repository was archived by the owner on Apr 17, 2024. It is now read-only.

Commit 83dd702

Browse files
wuhan005wuhan005
authored
Merge pull request #30 from vidar-team/dev
v0.0.4-pre
2 parents 5467ed9 + bf07ca4 commit 83dd702

30 files changed

+827
-457
lines changed

‎README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
[![Build](https://travis-ci.com/vidar-team/Cardinal.svg?branch=master)](https://travis-ci.org/vidar-team/Cardinal)
66
[![GoReport](https://goreportcard.com/badge/github.com/vidar-team/Cardinal)](https://goreportcard.com/report/github.com/vidar-team/Cardinal)
77
[![codecov](https://codecov.io/gh/vidar-team/Cardinal/branch/master/graph/badge.svg)](https://codecov.io/gh/vidar-team/Cardinal)
8+
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
89

10+
<!-- ALL-CONTRIBUTORS-BADGE:END -->
911
## 介绍
1012

1113
Cardinal 是由 Vidar-Team 开发的 AWD 比赛平台，使用 Go 编写。本程序可以作为 CTF 线下比赛平台，亦可用于团队内部 AWD 模拟练习。
@@ -83,7 +85,13 @@ chmod +x ./Cardinal
8385

8486
十分欢迎您和我们一起改进 Cardinal，您可以改进现有程序，加入新功能，完善文档，优化代码等。
8587

86-
[![Contributors](http://ergatejs.implements.io/badges/contributors/vidar-team/Cardinal_1280_96_10.png)](https://github.com/vidar-team/Cardinal/graphs/contributors)
88+
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
89+
<!-- prettier-ignore-start -->
90+
<!-- markdownlint-disable -->
91+
92+
<!-- markdownlint-enable -->
93+
<!-- prettier-ignore-end -->
94+
<!-- ALL-CONTRIBUTORS-LIST:END -->
8795

8896
## 协议与许可
8997

‎go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Cardinal
1+
module github.com/vidar-team/Cardinal
22

33
go 1.13
44

@@ -37,9 +37,11 @@ require (
3737
github.com/theplant/cldr v0.0.0-20190423050709-9f76f7ce4ee8 // indirect
3838
github.com/vidar-team/Cardinal_frontend v0.0.0-20200408105230-89ca4c2e48db
3939
github.com/vidar-team/Cardinal_manager_frontend v0.0.4
40+
golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd
4041
golang.org/x/net v0.0.0-20190923162816-aa69164e4478 // indirect
4142
golang.org/x/sys v0.0.0-20191010194322-b09406accb47 // indirect
4243
golang.org/x/text v0.3.0
44+
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384
4345
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
4446
gopkg.in/yaml.v2 v2.2.4 // indirect
4547
moul.io/http2curl v1.0.0 // indirect

‎go.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/nt
174174
golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
175175
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
176176
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
177+
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 h1:TFlARGu6Czu1z7q93HTxcP1P+/ZFC/IKythI5RzrnRg=
177178
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
178179
google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
179180
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=

‎src/bulletin.go

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package main
33
import (
44
"github.com/gin-gonic/gin"
55
"github.com/jinzhu/gorm"
6+
"github.com/vidar-team/Cardinal/src/locales"
7+
"github.com/vidar-team/Cardinal/src/utils"
68
"strconv"
79
)
810

@@ -26,7 +28,7 @@ type BulletinRead struct {
2628
func (s *Service) GetAllBulletins() (int, interface{}) {
2729
var bulletins []Bulletin
2830
s.Mysql.Model(&Bulletin{}).Order("`id` DESC").Find(&bulletins)
29-
return s.makeSuccessJSON(bulletins)
31+
return utils.MakeSuccessJSON(bulletins)
3032
}
3133

3234
// NewBulletin is post new bulletin handler for manager.
@@ -38,8 +40,8 @@ func (s *Service) NewBulletin(c *gin.Context) (int, interface{}) {
3840
var inputForm InputForm
3941
err := c.BindJSON(&inputForm)
4042
if err != nil {
41-
return s.makeErrJSON(400, 40000,
42-
s.I18n.T(c.GetString("lang"), "general.error_payload"),
43+
return utils.MakeErrJSON(400, 40000,
44+
locales.I18n.T(c.GetString("lang"), "general.error_payload"),
4345
)
4446
}
4547

@@ -49,12 +51,12 @@ func (s *Service) NewBulletin(c *gin.Context) (int, interface{}) {
4951
Content: inputForm.Content,
5052
}).RowsAffected != 1 {
5153
tx.Rollback()
52-
return s.makeErrJSON(500, 50000,
53-
s.I18n.T(c.GetString("lang"), "bulletin.post_error"),
54+
return utils.MakeErrJSON(500, 50000,
55+
locales.I18n.T(c.GetString("lang"), "bulletin.post_error"),
5456
)
5557
}
5658
tx.Commit()
57-
return s.makeSuccessJSON(s.I18n.T(c.GetString("lang"), "bulletin.post_success"))
59+
return utils.MakeSuccessJSON(locales.I18n.T(c.GetString("lang"), "bulletin.post_success"))
5860
}
5961

6062
// EditBulletin is edit new bulletin handler for manager.
@@ -67,16 +69,16 @@ func (s *Service) EditBulletin(c *gin.Context) (int, interface{}) {
6769
var inputForm InputForm
6870
err := c.BindJSON(&inputForm)
6971
if err != nil {
70-
return s.makeErrJSON(400, 40000,
71-
s.I18n.T(c.GetString("lang"), "general.error_payload"),
72+
return utils.MakeErrJSON(400, 40000,
73+
locales.I18n.T(c.GetString("lang"), "general.error_payload"),
7274
)
7375
}
7476

7577
var checkBulletin Bulletin
7678
s.Mysql.Where(&Bulletin{Model: gorm.Model{ID: inputForm.ID}}).Find(&checkBulletin)
7779
if checkBulletin.ID == 0 {
78-
return s.makeErrJSON(404, 40400,
79-
s.I18n.T(c.GetString("lang"), "bulletin.not_found"),
80+
return utils.MakeErrJSON(404, 40400,
81+
locales.I18n.T(c.GetString("lang"), "bulletin.not_found"),
8082
)
8183
}
8284

@@ -87,45 +89,45 @@ func (s *Service) EditBulletin(c *gin.Context) (int, interface{}) {
8789
tx := s.Mysql.Begin()
8890
if tx.Model(&Bulletin{}).Where(&Bulletin{Model: gorm.Model{ID: inputForm.ID}}).Updates(&newBulletin).RowsAffected != 1 {
8991
tx.Rollback()
90-
return s.makeErrJSON(500, 50001,
91-
s.I18n.T(c.GetString("lang"), "bulletin.put_error"),
92+
return utils.MakeErrJSON(500, 50001,
93+
locales.I18n.T(c.GetString("lang"), "bulletin.put_error"),
9294
)
9395
}
9496
tx.Commit()
9597

96-
return s.makeSuccessJSON(s.I18n.T(c.GetString("lang"), "bulletin.put_success"))
98+
return utils.MakeSuccessJSON(locales.I18n.T(c.GetString("lang"), "bulletin.put_success"))
9799
}
98100

99101
// DeleteBulletin is delete new bulletin handler for manager.
100102
func (s *Service) DeleteBulletin(c *gin.Context) (int, interface{}) {
101103
idStr, ok := c.GetQuery("id")
102104
if !ok {
103-
return s.makeErrJSON(400, 40000,
104-
s.I18n.T(c.GetString("lang"), "general.error_query"),
105+
return utils.MakeErrJSON(400, 40000,
106+
locales.I18n.T(c.GetString("lang"), "general.error_query"),
105107
)
106108
}
107109
id, err := strconv.Atoi(idStr)
108110
if err != nil {
109-
return s.makeErrJSON(400, 40000,
110-
s.I18n.T(c.GetString("lang"), "general.must_be_number", gin.H{"key": "id"}),
111+
return utils.MakeErrJSON(400, 40000,
112+
locales.I18n.T(c.GetString("lang"), "general.must_be_number", gin.H{"key": "id"}),
111113
)
112114
}
113115

114116
var checkBulletin Bulletin
115117
s.Mysql.Where(&Bulletin{Model: gorm.Model{ID: uint(id)}}).Find(&checkBulletin)
116118
if checkBulletin.ID == 0 {
117-
return s.makeErrJSON(404, 40400,
118-
s.I18n.T(c.GetString("lang"), "bulletin.not_found"),
119+
return utils.MakeErrJSON(404, 40400,
120+
locales.I18n.T(c.GetString("lang"), "bulletin.not_found"),
119121
)
120122
}
121123

122124
tx := s.Mysql.Begin()
123125
if tx.Where("id = ?", id).Delete(&Bulletin{}).RowsAffected != 1 {
124126
tx.Rollback()
125-
return s.makeErrJSON(500, 50002,
126-
s.I18n.T(c.GetString("lang"), "bulletin.delete_error"),
127+
return utils.MakeErrJSON(500, 50002,
128+
locales.I18n.T(c.GetString("lang"), "bulletin.delete_error"),
127129
)
128130
}
129131
tx.Commit()
130-
return s.makeSuccessJSON(s.I18n.T(c.GetString("lang"), "bulletin.delete_success"))
132+
return utils.MakeSuccessJSON(locales.I18n.T(c.GetString("lang"), "bulletin.delete_success"))
131133
}

0 commit comments

Comments
 (0)