diff --git a/server/adminserver/api/v1/system/mail.go b/server/adminserver/api/v1/system/mail.go index ccdcb4eb..c16b0374 100644 --- a/server/adminserver/api/v1/system/mail.go +++ b/server/adminserver/api/v1/system/mail.go @@ -2,6 +2,7 @@ package system import ( "f5" + "main/common" "main/constant" "main/model/system" "net/http" @@ -30,8 +31,8 @@ func (this *MailApi) AddMail(c *gin.Context) { UserRegEndTime int32 `json:"user_reg_end_time"` Subject string `json:"subject"` Content string `json:"content"` - Attachments string `json:"attachments"` - Recipients string `json:"recipients"` + Attachments []common.Attachment `json:"attachments"` + Recipients []string `json:"recipients"` }{} if err := c.ShouldBindJSON(&reqJson); err != nil { c.JSON(http.StatusOK, gin.H{ diff --git a/server/adminserver/common/types.go b/server/adminserver/common/types.go index dd06b34c..11efc62c 100644 --- a/server/adminserver/common/types.go +++ b/server/adminserver/common/types.go @@ -1,5 +1,10 @@ package common +type Attachment struct { + ItemId int32 `json:"item_id"` + ItemNum int32 `json:"item_num"` +} + type App interface { Run(func(), func()) AddSession(accountId string) string diff --git a/server/adminserver/model/system/mail.go b/server/adminserver/model/system/mail.go index 63758d70..cb72324a 100644 --- a/server/adminserver/model/system/mail.go +++ b/server/adminserver/model/system/mail.go @@ -1,5 +1,9 @@ package system +import ( + "main/common" +) + /* Recipients: [ @@ -23,8 +27,8 @@ type Mail struct { MailType int32 `gorm:"column:mail_type" json:"mail_type"` Subject string `gorm:"column:subject" json:"subject"` Content string `gorm:"column:content" json:"content"` - Recipients string `gorm:"column:recipients" json:"recipients"` - Attachments string `gorm:"column:attachments" json:"attachments"` + Recipients []string `gorm:"column:recipients;serializer:json" json:"recipients"` + Attachments []common.Attachment `gorm:"column:attachments" json:"attachments"` Deleted int32 `gorm:"column:deleted" json:"deleted"` SendTime int32 `gorm:"column:sendtime" json:"sendtime"` UserRegStartTime int32 `gorm:"column:user_reg_start_time" json:"user_reg_start_time"`