Skip to content

Commit efe539d

Browse files
krank666krank666
committed
Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev
2 parents 0306efb + 262c6b1 commit efe539d

File tree

15 files changed

+537
-44
lines changed

15 files changed

+537
-44
lines changed

‎README-zh_CN.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<img src="https://img.shields.io/badge/gin-1.4.0-lightBlue"/>
88
<img src="https://img.shields.io/badge/vue-2.6.10-brightgreen"/>
99
<img src="https://img.shields.io/badge/element--ui-2.12.0-green"/>
10-
<img src="https://img.shields.io/badge/gorm-1.9.10-red"/>
10+
<img src="https://img.shields.io/badge/gorm-1.9.12-red"/>
1111
</div>
1212

1313
[English](./README.md) | 简体中文

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<img src="https://img.shields.io/badge/gin-1.4.0-lightBlue"/>
88
<img src="https://img.shields.io/badge/vue-2.6.10-brightgreen"/>
99
<img src="https://img.shields.io/badge/element--ui-2.12.0-green"/>
10-
<img src="https://img.shields.io/badge/gorm-1.9.10-red"/>
10+
<img src="https://img.shields.io/badge/gorm-1.9.12-red"/>
1111
</div>
1212

1313
English | [简体中文](./README-zh_CN.md)

‎server/api/v1/exa_customer.go‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"gin-vue-admin/model/request"
88
resp "gin-vue-admin/model/response"
99
"gin-vue-admin/service"
10+
"gin-vue-admin/utils"
1011
"github.com/gin-gonic/gin"
1112
)
1213

@@ -21,6 +22,15 @@ import (
2122
func CreateExaCustomer(c *gin.Context) {
2223
var cu model.ExaCustomer
2324
_ = c.ShouldBindJSON(&cu)
25+
CustomerVerify := utils.Rules{
26+
"CustomerName": {utils.NotEmpty()},
27+
"CustomerPhoneData": {utils.NotEmpty()},
28+
}
29+
CustomerVerifyErr := utils.Verify(cu, CustomerVerify)
30+
if CustomerVerifyErr != nil {
31+
response.FailWithMessage(CustomerVerifyErr.Error(), c)
32+
return
33+
}
2434
claims, _ := c.Get("claims")
2535
waitUse := claims.(*request.CustomClaims)
2636
cu.SysUserID = waitUse.ID
@@ -44,6 +54,14 @@ func CreateExaCustomer(c *gin.Context) {
4454
func DeleteExaCustomer(c *gin.Context) {
4555
var cu model.ExaCustomer
4656
_ = c.ShouldBindJSON(&cu)
57+
CustomerVerify := utils.Rules{
58+
"ID": {utils.NotEmpty()},
59+
}
60+
CustomerVerifyErr := utils.Verify(cu.Model, CustomerVerify)
61+
if CustomerVerifyErr != nil {
62+
response.FailWithMessage(CustomerVerifyErr.Error(), c)
63+
return
64+
}
4765
err := service.DeleteExaCustomer(cu)
4866
if err != nil {
4967
response.FailWithMessage(fmt.Sprintf("删除失败：%v", err), c)
@@ -63,6 +81,23 @@ func DeleteExaCustomer(c *gin.Context) {
6381
func UpdateExaCustomer(c *gin.Context) {
6482
var cu model.ExaCustomer
6583
_ = c.ShouldBindJSON(&cu)
84+
IdCustomerVerify := utils.Rules{
85+
"ID": {utils.NotEmpty()},
86+
}
87+
IdCustomerVerifyErr := utils.Verify(cu.Model, IdCustomerVerify)
88+
if IdCustomerVerifyErr != nil {
89+
response.FailWithMessage(IdCustomerVerifyErr.Error(), c)
90+
return
91+
}
92+
CustomerVerify := utils.Rules{
93+
"CustomerName": {utils.NotEmpty()},
94+
"CustomerPhoneData": {utils.NotEmpty()},
95+
}
96+
CustomerVerifyErr := utils.Verify(cu, CustomerVerify)
97+
if CustomerVerifyErr != nil {
98+
response.FailWithMessage(CustomerVerifyErr.Error(), c)
99+
return
100+
}
66101
err := service.UpdateExaCustomer(&cu)
67102
if err != nil {
68103
response.FailWithMessage(fmt.Sprintf("更新失败：%v", err), c)
@@ -82,6 +117,14 @@ func UpdateExaCustomer(c *gin.Context) {
82117
func GetExaCustomer(c *gin.Context) {
83118
var cu model.ExaCustomer
84119
_ = c.ShouldBindQuery(&cu)
120+
IdCustomerVerify := utils.Rules{
121+
"ID": {utils.NotEmpty()},
122+
}
123+
IdCustomerVerifyErr := utils.Verify(cu.Model, IdCustomerVerify)
124+
if IdCustomerVerifyErr != nil {
125+
response.FailWithMessage(IdCustomerVerifyErr.Error(), c)
126+
return
127+
}
85128
err, customer := service.GetExaCustomer(cu.ID)
86129
if err != nil {
87130
response.FailWithMessage(fmt.Sprintf("获取失败：%v", err), c)
@@ -103,6 +146,11 @@ func GetExaCustomerList(c *gin.Context) {
103146
waitUse := claims.(*request.CustomClaims)
104147
var pageInfo request.PageInfo
105148
_ = c.ShouldBindQuery(&pageInfo)
149+
PageVerifyErr := utils.Verify(pageInfo, utils.CustomizeMap["PageVerify"])
150+
if PageVerifyErr != nil {
151+
response.FailWithMessage(PageVerifyErr.Error(), c)
152+
return
153+
}
106154
err, customerList, total := service.GetCustomerInfoList(waitUse.AuthorityId, pageInfo)
107155
if err != nil {
108156
response.FailWithMessage(fmt.Sprintf("获取失败：%v", err), c)

‎server/api/v1/sys_api.go‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"gin-vue-admin/model/request"
88
resp "gin-vue-admin/model/response"
99
"gin-vue-admin/service"
10+
"gin-vue-admin/utils"
1011
"github.com/gin-gonic/gin"
1112
)
1213

@@ -21,6 +22,17 @@ import (
2122
func CreateApi(c *gin.Context) {
2223
var api model.SysApi
2324
_ = c.ShouldBindJSON(&api)
25+
ApiVerify := utils.Rules{
26+
"Path": {utils.NotEmpty()},
27+
"Description": {utils.NotEmpty()},
28+
"ApiGroup": {utils.NotEmpty()},
29+
"Method": {utils.NotEmpty()},
30+
}
31+
ApiVerifyErr := utils.Verify(api, ApiVerify)
32+
if ApiVerifyErr != nil {
33+
response.FailWithMessage(ApiVerifyErr.Error(), c)
34+
return
35+
}
2436
err := service.CreateApi(api)
2537
if err != nil {
2638
response.FailWithMessage(fmt.Sprintf("创建失败，%v", err), c)
@@ -40,6 +52,14 @@ func CreateApi(c *gin.Context) {
4052
func DeleteApi(c *gin.Context) {
4153
var a model.SysApi
4254
_ = c.ShouldBindJSON(&a)
55+
ApiVerify := utils.Rules{
56+
"ID": {utils.NotEmpty()},
57+
}
58+
ApiVerifyErr := utils.Verify(a.Model, ApiVerify)
59+
if ApiVerifyErr != nil {
60+
response.FailWithMessage(ApiVerifyErr.Error(), c)
61+
return
62+
}
4363
err := service.DeleteApi(a)
4464
if err != nil {
4565
response.FailWithMessage(fmt.Sprintf("删除失败，%v", err), c)
@@ -62,6 +82,11 @@ func GetApiList(c *gin.Context) {
6282
// 此结构体仅本方法使用
6383
var sp request.SearchApiParams
6484
_ = c.ShouldBindJSON(&sp)
85+
PageVerifyErr := utils.Verify(sp.PageInfo, utils.CustomizeMap["PageVerify"])
86+
if PageVerifyErr != nil {
87+
response.FailWithMessage(PageVerifyErr.Error(), c)
88+
return
89+
}
6590
err, list, total := service.GetAPIInfoList(sp.SysApi, sp.PageInfo, sp.OrderKey, sp.Desc)
6691
if err != nil {
6792
response.FailWithMessage(fmt.Sprintf("获取数据失败，%v", err), c)
@@ -86,6 +111,11 @@ func GetApiList(c *gin.Context) {
86111
func GetApiById(c *gin.Context) {
87112
var idInfo request.GetById
88113
_ = c.ShouldBindJSON(&idInfo)
114+
IdVerifyErr := utils.Verify(idInfo, utils.CustomizeMap["IdVerify"])
115+
if IdVerifyErr != nil {
116+
response.FailWithMessage(IdVerifyErr.Error(), c)
117+
return
118+
}
89119
err, api := service.GetApiById(idInfo.Id)
90120
if err != nil {
91121
response.FailWithMessage(fmt.Sprintf("获取数据失败，%v", err), c)
@@ -105,6 +135,17 @@ func GetApiById(c *gin.Context) {
105135
func UpdateApi(c *gin.Context) {
106136
var api model.SysApi
107137
_ = c.ShouldBindJSON(&api)
138+
ApiVerify := utils.Rules{
139+
"Path": {utils.NotEmpty()},
140+
"Description": {utils.NotEmpty()},
141+
"ApiGroup": {utils.NotEmpty()},
142+
"Method": {utils.NotEmpty()},
143+
}
144+
ApiVerifyErr := utils.Verify(api, ApiVerify)
145+
if ApiVerifyErr != nil {
146+
response.FailWithMessage(ApiVerifyErr.Error(), c)
147+
return
148+
}
108149
err := service.UpdateApi(api)
109150
if err != nil {
110151
response.FailWithMessage(fmt.Sprintf("修改数据失败，%v", err), c)

‎server/api/v1/sys_authority.go‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"gin-vue-admin/model/request"
88
resp "gin-vue-admin/model/response"
99
"gin-vue-admin/service"
10+
"gin-vue-admin/utils"
1011
"github.com/gin-gonic/gin"
1112
)
1213

@@ -21,6 +22,16 @@ import (
2122
func CreateAuthority(c *gin.Context) {
2223
var auth model.SysAuthority
2324
_ = c.ShouldBindJSON(&auth)
25+
AuthorityVerify := utils.Rules{
26+
"AuthorityId": {utils.NotEmpty()},
27+
"AuthorityName": {utils.NotEmpty()},
28+
"ParentId": {utils.NotEmpty()},
29+
}
30+
AuthorityVerifyErr := utils.Verify(auth, AuthorityVerify)
31+
if AuthorityVerifyErr != nil {
32+
response.FailWithMessage(AuthorityVerifyErr.Error(), c)
33+
return
34+
}
2435
err, authBack := service.CreateAuthority(auth)
2536
if err != nil {
2637
response.FailWithMessage(fmt.Sprintf("创建失败，%v", err), c)
@@ -40,6 +51,24 @@ func CreateAuthority(c *gin.Context) {
4051
func CopyAuthority(c *gin.Context) {
4152
var copyInfo resp.SysAuthorityCopyResponse
4253
_ = c.ShouldBindJSON(&copyInfo)
54+
OldAuthorityVerify := utils.Rules{
55+
"OldAuthorityId": {utils.NotEmpty()},
56+
}
57+
OldAuthorityVerifyErr := utils.Verify(copyInfo, OldAuthorityVerify)
58+
if OldAuthorityVerifyErr != nil {
59+
response.FailWithMessage(OldAuthorityVerifyErr.Error(), c)
60+
return
61+
}
62+
AuthorityVerify := utils.Rules{
63+
"AuthorityId": {utils.NotEmpty()},
64+
"AuthorityName": {utils.NotEmpty()},
65+
"ParentId": {utils.NotEmpty()},
66+
}
67+
AuthorityVerifyErr := utils.Verify(copyInfo.Authority, AuthorityVerify)
68+
if AuthorityVerifyErr != nil {
69+
response.FailWithMessage(AuthorityVerifyErr.Error(), c)
70+
return
71+
}
4372
err, authBack := service.CopyAuthority(copyInfo)
4473
if err != nil {
4574
response.FailWithMessage(fmt.Sprintf("拷贝失败，%v", err), c)
@@ -59,6 +88,11 @@ func CopyAuthority(c *gin.Context) {
5988
func DeleteAuthority(c *gin.Context) {
6089
var a model.SysAuthority
6190
_ = c.ShouldBindJSON(&a)
91+
AuthorityIdVerifyErr := utils.Verify(a, utils.CustomizeMap["AuthorityIdVerify"])
92+
if AuthorityIdVerifyErr != nil {
93+
response.FailWithMessage(AuthorityIdVerifyErr.Error(), c)
94+
return
95+
}
6296
//删除角色之前需要判断是否有用户正在使用此角色
6397
err := service.DeleteAuthority(&a)
6498
if err != nil {
@@ -79,6 +113,16 @@ func DeleteAuthority(c *gin.Context) {
79113
func UpdateAuthority(c *gin.Context) {
80114
var auth model.SysAuthority
81115
_ = c.ShouldBindJSON(&auth)
116+
AuthorityVerify := utils.Rules{
117+
"AuthorityId": {utils.NotEmpty()},
118+
"AuthorityName": {utils.NotEmpty()},
119+
"ParentId": {utils.NotEmpty()},
120+
}
121+
AuthorityVerifyErr := utils.Verify(auth, AuthorityVerify)
122+
if AuthorityVerifyErr != nil {
123+
response.FailWithMessage(AuthorityVerifyErr.Error(), c)
124+
return
125+
}
82126
err, authority := service.UpdateAuthority(auth)
83127
if err != nil {
84128
response.FailWithMessage(fmt.Sprintf("更新失败，%v", err), c)
@@ -98,6 +142,11 @@ func UpdateAuthority(c *gin.Context) {
98142
func GetAuthorityList(c *gin.Context) {
99143
var pageInfo request.PageInfo
100144
_ = c.ShouldBindJSON(&pageInfo)
145+
PageVerifyErr := utils.Verify(pageInfo, utils.CustomizeMap["PageVerify"])
146+
if PageVerifyErr != nil {
147+
response.FailWithMessage(PageVerifyErr.Error(), c)
148+
return
149+
}
101150
err, list, total := service.GetAuthorityInfoList(pageInfo)
102151
if err != nil {
103152
response.FailWithMessage(fmt.Sprintf("获取数据失败，%v", err), c)
@@ -122,6 +171,11 @@ func GetAuthorityList(c *gin.Context) {
122171
func SetDataAuthority(c *gin.Context) {
123172
var auth model.SysAuthority
124173
_ = c.ShouldBindJSON(&auth)
174+
AuthorityIdVerifyErr := utils.Verify(auth, utils.CustomizeMap["AuthorityIdVerify"])
175+
if AuthorityIdVerifyErr != nil {
176+
response.FailWithMessage(AuthorityIdVerifyErr.Error(), c)
177+
return
178+
}
125179
err := service.SetDataAuthority(auth)
126180
if err != nil {
127181
response.FailWithMessage(fmt.Sprintf("设置关联失败，%v", err), c)

‎server/api/v1/sys_auto_code.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"gin-vue-admin/global/response"
66
"gin-vue-admin/model"
77
"gin-vue-admin/service"
8+
"gin-vue-admin/utils"
89
"github.com/gin-gonic/gin"
910
"net/url"
1011
"os"
@@ -21,6 +22,17 @@ import (
2122
func CreateTemp(c *gin.Context) {
2223
var a model.AutoCodeStruct
2324
_ = c.ShouldBindJSON(&a)
25+
AutoCodeVerify := utils.Rules{
26+
"Abbreviation": {utils.NotEmpty()},
27+
"StructName": {utils.NotEmpty()},
28+
"PackageName": {utils.NotEmpty()},
29+
"Fields": {utils.NotEmpty()},
30+
}
31+
WKVerifyErr := utils.Verify(a, AutoCodeVerify)
32+
if WKVerifyErr!=nil {
33+
response.FailWithMessage(WKVerifyErr.Error(), c)
34+
return
35+
}
2436
if a.AutoCreateApiToSql {
2537
apiList := [5]model.SysApi{
2638
{

‎server/api/v1/sys_casbin.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"gin-vue-admin/model/request"
77
resp "gin-vue-admin/model/response"
88
"gin-vue-admin/service"
9+
"gin-vue-admin/utils"
910
"github.com/gin-gonic/gin"
1011
)
1112

@@ -20,6 +21,11 @@ import (
2021
func UpdateCasbin(c *gin.Context) {
2122
var cmr request.CasbinInReceive
2223
_ = c.ShouldBindJSON(&cmr)
24+
AuthorityIdVerifyErr := utils.Verify(cmr, utils.CustomizeMap["AuthorityIdVerify"])
25+
if AuthorityIdVerifyErr != nil {
26+
response.FailWithMessage(AuthorityIdVerifyErr.Error(), c)
27+
return
28+
}
2329
err := service.UpdateCasbin(cmr.AuthorityId, cmr.CasbinInfos)
2430
if err != nil {
2531
response.FailWithMessage(fmt.Sprintf("添加规则失败，%v", err), c)
@@ -39,6 +45,11 @@ func UpdateCasbin(c *gin.Context) {
3945
func GetPolicyPathByAuthorityId(c *gin.Context) {
4046
var cmr request.CasbinInReceive
4147
_ = c.ShouldBindJSON(&cmr)
48+
AuthorityIdVerifyErr := utils.Verify(cmr, utils.CustomizeMap["AuthorityIdVerify"])
49+
if AuthorityIdVerifyErr != nil {
50+
response.FailWithMessage(AuthorityIdVerifyErr.Error(), c)
51+
return
52+
}
4253
paths := service.GetPolicyPathByAuthorityId(cmr.AuthorityId)
4354
response.OkWithData(resp.PolicyPathResponse{Paths: paths}, c)
4455
}

0 commit comments

Comments
 (0)