diff --git a/controllers/user/userLogin.go b/controllers/user/userLogin.go index f673c01..aa841f4 100644 --- a/controllers/user/userLogin.go +++ b/controllers/user/userLogin.go @@ -137,10 +137,31 @@ func UserLogin(c *gin.Context) { } c.JSON(http.StatusOK, gin.H{"result": "success", "error": nil, "code": "20001", "token": token, - "userinfo": map[string]string{ - "username": username, - "uid": openid, - "telephone": phoneInfo.PhoneNumber, + "userinfo": struct { + Username string `json:"username"` + UID string `json:"uid"` + Telephone string `json:"telephone"` + AvatarURL string `json:"avatar_url"` + Gender int `json:"gender"` + Birthdate string `json:"birth_date"` + Bio string `json:"bio"` + Total_points int `json:"total_points"` + }{ + Username: username, + UID: openid, + Telephone: phoneInfo.PhoneNumber, + AvatarURL: user.AvatarURL, + Gender: user.Gender, + Birthdate: func() string { + if user.Birthdate != nil { + // 如果指针不为空,解引用并格式化 + return user.Birthdate.Format("2006-01-02") + } + // 如果指针为空(数据库中为 NULL),返回空字符串或默认值 + return "" + }(), // 格式化 time.Time + Bio: user.Bio, + Total_points: user.TotalPoints, }, }) }