diff --git a/server/wheelserver/api/v1/user/user.go b/server/wheelserver/api/v1/user/user.go index e178a796..4a6a15bd 100644 --- a/server/wheelserver/api/v1/user/user.go +++ b/server/wheelserver/api/v1/user/user.go @@ -21,7 +21,10 @@ func (this *UserApi) Login(c *gin.Context) { return } user := new(model.User) - userVo := new(vo.User) + rspObj := struct { + vo.BaseVo + UserInfo vo.User `json:"user_info"` + }{} if result := f5.GetApp().GetOrmDb(constant.WHEEL_DB).Table(user.TableName()).Take( user, "account_id = ?", s.GetAccountId()); result.Error != nil && !errors.Is(result.Error, gorm.ErrRecordNotFound) { @@ -41,6 +44,6 @@ func (this *UserApi) Login(c *gin.Context) { return } } - userVo.FromModel(user) - c.JSON(200, userVo) + rspObj.UserInfo.FromModel(user) + c.JSON(200, rspObj) } diff --git a/server/wheelserver/vo/user.go b/server/wheelserver/vo/user.go index 3397939b..44c6880e 100644 --- a/server/wheelserver/vo/user.go +++ b/server/wheelserver/vo/user.go @@ -5,7 +5,6 @@ import ( ) type User struct { - BaseVo AccountId string `json:"account_id"` NickName string `json:"nickname"` Avatar string `json:"avatar"`