From 0572bd3ac740d0eed6841f170e69859fbd024151 Mon Sep 17 00:00:00 2001 From: smail Date: Fri, 25 Sep 2026 02:26:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=82=AE=E4=BB=B6=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=BA=8F=E5=88=97=E5=8C=96=E9=81=97=E6=BC=8F=E9=BB=91?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E5=8F=8A=E5=B7=B2=E8=AF=BB=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dto/response/email.go | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/backend/dto/response/email.go b/backend/dto/response/email.go index 51571e31..78ef7568 100644 --- a/backend/dto/response/email.go +++ b/backend/dto/response/email.go @@ -1,6 +1,10 @@ package response -import "git.pcux.cn/xuans/Smail/models" +import ( + "encoding/json" + + "git.pcux.cn/xuans/Smail/models" +) type EmailResponseData struct { models.Email `xorm:"extends"` @@ -12,6 +16,30 @@ type EmailResponseData struct { IsBlacklisted bool `xorm:"-" json:"is_blacklisted"` } +func (d *EmailResponseData) MarshalJSON() ([]byte, error) { + data, err := d.Email.MarshalJSON() + if err != nil { + return nil, err + } + var fields map[string]json.RawMessage + if err := json.Unmarshal(data, &fields); err != nil { + return nil, err + } + for name, value := range map[string]any{ + "is_read": d.IsRead, + "serial_number": d.SerialNumber, + "ue_id": d.UeId, + "is_blacklisted": d.IsBlacklisted, + } { + encoded, err := json.Marshal(value) + if err != nil { + return nil, err + } + fields[name] = encoded + } + return json.Marshal(fields) +} + type UserEmailUIDData struct { models.UserEmail `xorm:"extends"` SerialNumber int `json:"serial_number"`