Unifies the output of the routing layer and the isolated response structure

This commit is contained in:
Granty1
2020-04-08 14:00:08 +08:00
parent 5d222585dd
commit 4277505c6a
24 changed files with 250 additions and 121 deletions
+11 -10
View File
@@ -5,6 +5,7 @@ import (
"gin-vue-admin/global/response"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
resp "gin-vue-admin/model/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"github.com/gin-gonic/gin"
@@ -23,12 +24,12 @@ func UploadFile(c *gin.Context) {
noSave := c.DefaultQuery("noSave", "0")
_, header, err := c.Request.FormFile("file")
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("上传文件失败,%v", err), c)
response.FailWithMessage(fmt.Sprintf("上传文件失败,%v", err), c)
} else {
//文件上传后拿到文件路径
err, filePath, key := utils.Upload(header, USER_HEADER_BUCKET, USER_HEADER_IMG_PATH)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("接收返回值失败,%v", err), c)
response.FailWithMessage(fmt.Sprintf("接收返回值失败,%v", err), c)
} else {
//修改数据库后得到修改后的user并且返回供前端使用
var file model.ExaFileUploadAndDownload
@@ -41,9 +42,9 @@ func UploadFile(c *gin.Context) {
err = service.Upload(file)
}
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("修改数据库链接失败,%v", err), c)
response.FailWithMessage(fmt.Sprintf("修改数据库链接失败,%v", err), c)
} else {
response.Result(response.SUCCESS, gin.H{"file": file}, "上传成功", c)
response.OkDetailed(resp.ExaFileResponse{File: file}, "上传成功", c)
}
}
@@ -62,18 +63,18 @@ func DeleteFile(c *gin.Context) {
_ = c.ShouldBindJSON(&file)
err, f := service.FindFile(file.ID)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("删除失败,%v", err), c)
response.FailWithMessage(fmt.Sprintf("删除失败,%v", err), c)
} else {
err = utils.DeleteFile(USER_HEADER_BUCKET, f.Key)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("删除失败,%v", err), c)
response.FailWithMessage(fmt.Sprintf("删除失败,%v", err), c)
} else {
err = service.DeleteFile(f)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("删除失败,%v", err), c)
response.FailWithMessage(fmt.Sprintf("删除失败,%v", err), c)
} else {
response.Result(response.SUCCESS, gin.H{}, "删除成功", c)
response.OkWithMessage("删除成功", c)
}
}
}
@@ -92,9 +93,9 @@ func GetFileList(c *gin.Context) {
_ = c.ShouldBindJSON(&pageInfo)
err, list, total := service.GetFileRecordInfoList(pageInfo)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("获取数据失败,%v", err), c)
response.FailWithMessage(fmt.Sprintf("获取数据失败,%v", err), c)
} else {
response.Result(response.SUCCESS, gin.H{
response.OkDetailed(gin.H{
"list": list,
"total": total,
"page": pageInfo.Page,