rogee/quyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: all

Browse Source
This commit is contained in:
yanghao05
2025-04-18 20:46:17 +08:00
parent a1537f9146
commit 4abd548325
8 changed files with 35 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
backend/app/http/admin/posts.go
View File

@@ -28,7 +28,7 @@ func (ctl *posts) List(ctx fiber.Ctx, pagination *requests.Pagination, query *Li
type PostForm struct {
Title string `json:"title"`
HeadImageIds []int64 `json:"head_image_ids"`
HeadImages []int64 `json:"head_images"`
Price int64 `json:"price"`
Discount int16 `json:"discount"`
Introduction string `json:"introduction"`
@@ -43,7 +43,7 @@ type PostForm struct {
func (ctl *posts) Create(ctx fiber.Ctx, form *PostForm) error {
post := model.Posts{
Title: form.Title,
HeadImages: fields.ToJson(form.HeadImageIds),
HeadImages: fields.ToJson(form.HeadImages),
Price: form.Price,
Discount: form.Discount,
Description: form.Introduction,
@@ -60,7 +60,7 @@ func (ctl *posts) Create(ctx fiber.Ctx, form *PostForm) error {
}
assets := lo.Map(medias, func(media *model.Medias, _ int) fields.MediaAsset {
return fields.MediaAsset{
Type: models.Medias.ConvertFileTypeByMimeType(media.MimeType),
Type: media.MimeType,
Media: media.ID,
Mark: nil,
}
@@ -86,7 +86,7 @@ func (ctl *posts) Update(ctx fiber.Ctx, id int64, form *PostForm) error {
post := &model.Posts{
Title: form.Title,
HeadImages: fields.ToJson(form.HeadImageIds),
HeadImages: fields.ToJson(form.HeadImages),
Price: form.Price,
Discount: form.Discount,
Description: form.Introduction,
@@ -108,7 +108,7 @@ func (ctl *posts) Update(ctx fiber.Ctx, id int64, form *PostForm) error {
}
assets := lo.Map(medias, func(media *model.Medias, _ int) fields.MediaAsset {
return fields.MediaAsset{
Type: models.Medias.ConvertFileTypeByMimeType(media.MimeType),
Type: media.MimeType,
Media: media.ID,
Mark: nil,
}
@@ -164,13 +164,11 @@ func (ctl *posts) Show(ctx fiber.Ctx, id int64) (*PostItem, error) {
Posts: post,
Medias: lo.Map(medias, func(media *model.Medias, _ int) *models.MediaItem {
return &models.MediaItem{
ID: media.ID,
Name: media.Name,
UploadTime: media.CreatedAt.Format("2006-01-02 15:04:05"),
FileSize: media.Size,
MimeType: media.MimeType,
FileType: models.Medias.ConvertFileTypeByMimeType(media.MimeType),
ThumbnailUrl: "",
ID: media.ID,
Name: media.Name,
UploadTime: media.CreatedAt.Format("2006-01-02 15:04:05"),
FileSize: media.Size,
MimeType: media.MimeType,
}
}),
}, nil

52
backend/app/models/medias.go
View File

@@ -5,7 +5,6 @@ import (
"time"
"quyun/app/requests"
"quyun/database/fields"
"quyun/database/schemas/public/model"
"quyun/database/schemas/public/table"
@@ -15,13 +14,11 @@ import (
)
type MediaItem struct {
ID int64 `json:"id"`
Name string `json:"name"`
UploadTime string `json:"upload_time"`
FileSize int64 `json:"file_size"`
MimeType string `json:"media_type"`
FileType fields.MediaAssetType `json:"file_type"`
ThumbnailUrl string `json:"thumbnail_url"`
ID int64 `json:"id"`
Name string `json:"name"`
UploadTime string `json:"upload_time"`
FileSize int64 `json:"file_size"`
MimeType string `json:"media_type"`
}
// @provider
@@ -97,13 +94,11 @@ func (m *mediasModel) List(ctx context.Context, pagination *requests.Pagination,
// Convert model.Medias to MediaItem
mediaItems := lo.Map(medias, func(media model.Medias, _ int) *MediaItem {
return &MediaItem{
ID: media.ID,
Name: media.Name,
UploadTime: media.CreatedAt.Format("2006-01-02 15:04:05"),
FileSize: media.Size,
MimeType: media.MimeType,
FileType: m.ConvertFileTypeByMimeType(media.MimeType),
ThumbnailUrl: "",
ID: media.ID,
Name: media.Name,
UploadTime: media.CreatedAt.Format("2006-01-02 15:04:05"),
FileSize: media.Size,
MimeType: media.MimeType,
}
})
@@ -141,33 +136,6 @@ func (m *mediasModel) Create(ctx context.Context, model *model.Medias) error {
return nil
}
func (m *mediasModel) ConvertFileTypeByMimeType(mimeType string) fields.MediaAssetType {
switch mimeType {
case "image/jpeg", "image/jpg", "image/png", "image/gif":
return fields.MediaAssetTypeImage
case "video/mp4", "video/x-m4v":
return fields.MediaAssetTypeVideo
case "audio/mpeg":
return fields.MediaAssetTypeAudio
case "application/pdf",
"application/msword",
"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
"application/vnd.ms-excel",
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
"application/vnd.ms-powerpoint",
"application/vnd.openxmlformats-officedocument.presentationml.presentation":
return fields.MediaAssetTypeDocument
case "application/rar",
"application/x-rar-compressed",
"application/x-zip-compressed",
"application/x-zip",
"application/zip",
"application/x-7z-compressed":
return fields.MediaAssetTypeArchive
}
return fields.MediaAssetTypeUnknown
}
// GetByIds
func (m *mediasModel) GetByIds(ctx context.Context, ids []int64) ([]*model.Medias, error) {
if len(ids) == 0 {

24
backend/app/models/medias_test.go
View File

@@ -11,7 +11,6 @@ import (
"quyun/app/requests"
"quyun/app/service/testx"
"quyun/database"
"quyun/database/fields"
"quyun/database/schemas/public/model"
"quyun/database/schemas/public/table"
@@ -189,26 +188,3 @@ func (s *MediasTestSuite) Test_Page() {
})
})
}
// Test ConvertFileTypeByMimeType
func (s *MediasTestSuite) Test_ConvertFileTypeByMimeType() {
Convey("ConvertFileTypeByMimeType", s.T(), func() {
Convey("image", func() {
mimeType := "image/jpeg"
fileType := Medias.ConvertFileTypeByMimeType(mimeType)
So(fileType, ShouldEqual, fields.MediaAssetTypeImage)
})
Convey("video", func() {
mimeType := "video/mp4"
fileType := Medias.ConvertFileTypeByMimeType(mimeType)
So(fileType, ShouldEqual, fields.MediaAssetTypeVideo)
})
Convey("invalid mime type", func() {
mimeType := "invalid/type"
fileType := Medias.ConvertFileTypeByMimeType(mimeType)
So(fileType, ShouldEqual, fields.MediaAssetTypeUnknown)
})
})
}

4
backend/app/models/posts_test.go
View File

@@ -58,11 +58,11 @@ func (s *PostsTestSuite) Test_BatchInsert() {
Tags: fields.ToJson([]string{"tag1", "tag2", "tag3"}),
Assets: fields.ToJson([]fields.MediaAsset{
{
Type: fields.MediaAssetTypeAudio,
Type: "video/mp4",
Media: rand.Int63n(10000),
},
{
Type: fields.MediaAssetTypeVideo,
Type: "video/mp4",
Media: rand.Int63n(10000),
},
}),