chore: 优化代码

Author: tangtanglove

app/admin/uploads/image.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/quarkcloudio/quark-go/v3"
+	"github.com/quarkcloudio/quark-go/v3/dto/request"
 	"github.com/quarkcloudio/quark-go/v3/dto/response"
 	"github.com/quarkcloudio/quark-go/v3/model"
 	"github.com/quarkcloudio/quark-go/v3/service"
@@ -52,50 +53,50 @@ func (p *Image) RouteInit() interface{} {
 
 // 获取文件列表
 func (p *Image) GetList(ctx *quark.Context) error {
-	page := ctx.Query("page", "1")
-	categoryId := ctx.Query("categoryId", "")
-	name := ctx.Query("name", "")
-	startDate := ctx.Query("createtime[0]", "")
-	endDate := ctx.Query("createtime[1]", "")
-	currentPage, _ := strconv.Atoi(page.(string))
+	imageListReq := request.ImageListReq{}
+	err := ctx.Bind(&imageListReq)
+	if err != nil {
+		return ctx.CJSONError("参数错误")
+	}
 
 	adminInfo, _ := service.NewAuthService(ctx).GetAdmin()
 	pictures, total, err := service.NewAttachmentService().GetListBySearch(
 		adminInfo.Id,
 		"IMAGE",
-		categoryId,
-		name,
-		startDate,
-		endDate,
-		currentPage,
+		imageListReq.CategoryId,
+		imageListReq.Name,
+		imageListReq.Createtime[0],
+		imageListReq.Createtime[1],
+		imageListReq.Page,
 	)
 	if err != nil {
 		return ctx.CJSONError(err.Error())
 	}
 
-	pagination := map[string]interface{}{
-		"defaultCurrent": 1,
-		"current":        currentPage,
-		"pageSize":       8,
-		"total":          total,
-	}
-
 	categorys, err := service.NewAttachmentCategoryService().GetList(adminInfo.Id)
 	if err != nil {
 		return ctx.CJSONError(err.Error())
 	}
 
-	return ctx.CJSONOk("获取成功", map[string]interface{}{
-		"pagination": pagination,
-		"lists":      pictures,
-		"categorys":  categorys,
+	return ctx.CJSONOk("获取成功", response.ImageListResp{
+		Pagination: response.Pagination{
+			Current:        imageListReq.Page,
+			DefaultCurrent: 1,
+			PageSize:       8,
+			Total:          total,
+		},
+		List:      pictures,
+		Categorys: categorys,
 	})
 }
 
 // 图片删除
 func (p *Image) Delete(ctx *quark.Context) error {
 	data := map[string]interface{}{}
-	json.Unmarshal(ctx.Body(), &data)
+	if err := ctx.BodyParser(&data); err != nil {
+		return ctx.CJSONError("参数错误")
+	}
+
 	if data["id"] == "" {
 		return ctx.CJSONError("参数错误")
 	}
@@ -127,9 +128,6 @@ func (p *Image) Crop(ctx *quark.Context) error {
 	if err != nil {
 		return ctx.CJSONError(err.Error())
 	}
-	if pictureInfo.Id == 0 {
-		return ctx.CJSONError("文件不存在")
-	}
 
 	adminInfo, err := service.NewAuthService(ctx).GetAdmin()
 	if err != nil {

dto/request/upload.go

@@ -0,0 +1,9 @@
+package request
+
+// 获取图片列表请求
+type ImageListReq struct {
+	Page       int      `query:"page"`
+	CategoryId int      `query:"categoryId"`
+	Name       string   `query:"name"`
+	Createtime []string `query:"createtime"`
+}

dto/response/upload.go

@@ -12,3 +12,18 @@ type UploadResp struct {
 	Url         string      `json:"url"`
 	Extra       interface{} `json:"extra"`
 }
+
+// 获取图片列表请求
+type Pagination struct {
+	DefaultCurrent int         `json:"defaultCurrent"`
+	Current        interface{} `json:"current"`
+	PageSize       int         `json:"pageSize"`
+	Total          interface{} `json:"total"`
+}
+
+// 获取图片列表请求
+type ImageListResp struct {
+	Pagination Pagination  `json:"pagination"`
+	List       interface{} `json:"list"`
+	Categorys  interface{} `json:"categorys"`
+}

engine.go

@@ -22,7 +22,7 @@ const (
 	AppName = "QuarkGo"
 
 	// 版本号
-	Version = "3.8.8"
+	Version = "3.8.9"
 
 	// 包名
 	PkgName = "github.com/quarkcloudio/quark-go/v3"