diff --git a/models/account.go b/models/account.go index 9a9cbe4..dc67efd 100644 --- a/models/account.go +++ b/models/account.go @@ -1,19 +1,38 @@ package models import ( + "log" "main/configs" "net/http" "time" ) type Account struct { - ID int `json:"id"` - Name string `json:"name"` - Email string `json:"email"` - Admin bool `json:"admin"` - SessionID string `json:"session_id"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + ID int `json:"id"` + Name string `json:"name"` + Email string `json:"email"` + Admin bool `json:"admin"` + SessionID string `json:"session_id"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` + LikeList interface{} `json:"likes" gorm:"-"` +} + +func (account *Account) ReadLikeList() { + is, err := LikeImage.GetA(string(rune(account.ID))) + if err != nil { + log.Println(err) + return + } + ms, err := LikeModel.GetA(string(rune(account.ID))) + if err != nil { + log.Println(err) + return + } + account.LikeList = map[string]interface{}{ + "images": is, + "models": ms, + } } func AccountRead(w http.ResponseWriter, r *http.Request, cb func(account *Account)) { diff --git a/routers/account.go b/routers/account.go index 7bc62f7..bfde7a0 100644 --- a/routers/account.go +++ b/routers/account.go @@ -9,6 +9,7 @@ import ( // 獲取當前賬戶信息(重寫, 爲輸出增加sid字段) func AccountGet(w http.ResponseWriter, r *http.Request) { models.AccountRead(w, r, func(account *models.Account) { + account.ReadLikeList() w.Header().Set("Content-Type", "application/json; charset=utf-8") w.Write(utils.ToJSON(account)) })