estel/gva
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow

Browse Source 
 Conflicts:
	server/cmd/datas/apis.go
	server/cmd/datas/menus.go
	server/model/sys_workflow.go
	server/model/sys_workflow_process.go
This commit is contained in:
pixel
2020-10-29 11:41:38 +08:00
parent 0e1a820c3a 10d8d7f28a
commit c570c095b9
36 changed files with 280 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/api/v1/exa_breakpoint_continue.go
View File

@@ -38,6 +38,7 @@ func BreakpointContinue(c *gin.Context) {
defer f.Close()
cen, _ := ioutil.ReadAll(f)
if flag := utils.CheckMd5(cen, chunkMd5); !flag {
response.FailWithMessage(err.Error(), c)
return
}
err, file := service.FindOrCreateFile(fileMd5, fileName, chunkTotal)

6
server/api/v1/exa_customer.go
View File

@@ -57,7 +57,7 @@ func DeleteExaCustomer(c *gin.Context) {
CustomerVerify := utils.Rules{
"ID": {utils.NotEmpty()},
}
CustomerVerifyErr := utils.Verify(cu.Model, CustomerVerify)
CustomerVerifyErr := utils.Verify(cu.GVA_MODEL, CustomerVerify)
if CustomerVerifyErr != nil {
response.FailWithMessage(CustomerVerifyErr.Error(), c)
return
@@ -84,7 +84,7 @@ func UpdateExaCustomer(c *gin.Context) {
IdCustomerVerify := utils.Rules{
"ID": {utils.NotEmpty()},
}
IdCustomerVerifyErr := utils.Verify(cu.Model, IdCustomerVerify)
IdCustomerVerifyErr := utils.Verify(cu.GVA_MODEL, IdCustomerVerify)
if IdCustomerVerifyErr != nil {
response.FailWithMessage(IdCustomerVerifyErr.Error(), c)
return
@@ -120,7 +120,7 @@ func GetExaCustomer(c *gin.Context) {
IdCustomerVerify := utils.Rules{
"ID": {utils.NotEmpty()},
}
IdCustomerVerifyErr := utils.Verify(cu.Model, IdCustomerVerify)
IdCustomerVerifyErr := utils.Verify(cu.GVA_MODEL, IdCustomerVerify)
if IdCustomerVerifyErr != nil {
response.FailWithMessage(IdCustomerVerifyErr.Error(), c)
return

2
server/api/v1/sys_api.go
View File

@@ -55,7 +55,7 @@ func DeleteApi(c *gin.Context) {
ApiVerify := utils.Rules{
"ID": {utils.NotEmpty()},
}
ApiVerifyErr := utils.Verify(a.Model, ApiVerify)
ApiVerifyErr := utils.Verify(a.GVA_MODEL, ApiVerify)
if ApiVerifyErr != nil {
response.FailWithMessage(ApiVerifyErr.Error(), c)
return