diff --git a/req/request.go b/req/request.go index 39ae35f6a7e6800b60bb49a3c4fb284582bb12d7..6dcb2357e41abbd4ce581a70d7df7f057f6e4e2a 100644 --- a/req/request.go +++ b/req/request.go @@ -7,6 +7,7 @@ import ( "github.com/gin-gonic/gin" "hilo-group/domain/cache/user_c" "hilo-group/domain/model/res_m" + "hilo-group/domain/model/user_m" "hilo-group/myerr" "hilo-group/myerr/bizerr" "strconv" @@ -88,25 +89,11 @@ func GetUserIdLang(c *gin.Context, myContext *mycontext.MyContext) (mysql.ID, st func GetUserEx(c *gin.Context, myContext *mycontext.MyContext) (mysql.ID, string, string, string, string, error) { if userIdStr, ok := c.Keys[mycontext.USERID]; ok { userId := userIdStr.(uint64) - - externalId, ok1 := c.Get(mycontext.EXTERNAL_ID) - nick, ok2 := c.Get(mycontext.NICK) - avatar, ok3 := c.Get(mycontext.AVATAR) - country, ok4 := c.Get(mycontext.COUNTRY) - ok := ok1 && ok2 && ok3 && ok4 - if ok { - return userId, externalId.(string), nick.(string), avatar.(string), country.(string), nil - } else { - //var user user_m.User - //if err := mysql.Db.First(&user, userId).Error; err != nil { - // return 0, "", "", "", "", bizerr.ExternalIdNoExist - //} - user, err := user_c.GetUserTinyById(domain.CreateModelContext(myContext), userId) - if err != nil { - return 0, "", "", "", "", bizerr.ExternalIdNoExist - } - return userId, user.ExternalId, user.Nick, user.Avatar, user.Country, nil + user, err := user_m.GetUser(domain.CreateModelContext(myContext), userId) + if err != nil { + return 0, "", "", "", "", bizerr.ExternalIdNoExist } + return userId, user.ExternalId, user.Nick, user.Avatar, user.Country, nil } return 0, "", "", "", "", bizerr.ParaMissing }