|
|
@ -4,7 +4,6 @@ import (
|
|
|
|
"Lee-WineList/common/constant"
|
|
|
|
"Lee-WineList/common/constant"
|
|
|
|
"Lee-WineList/model/entity"
|
|
|
|
"Lee-WineList/model/entity"
|
|
|
|
"Lee-WineList/repository"
|
|
|
|
"Lee-WineList/repository"
|
|
|
|
"Lee-WineList/utils"
|
|
|
|
|
|
|
|
"errors"
|
|
|
|
"errors"
|
|
|
|
"git.echol.cn/loser/logger/log"
|
|
|
|
"git.echol.cn/loser/logger/log"
|
|
|
|
"strconv"
|
|
|
|
"strconv"
|
|
|
@ -16,24 +15,24 @@ func getUser(account string, loginType constant.LoginType, nikeName string, avat
|
|
|
|
|
|
|
|
|
|
|
|
// 定义微信小程序信息
|
|
|
|
// 定义微信小程序信息
|
|
|
|
//var unionId, openId, sessionKey string
|
|
|
|
//var unionId, openId, sessionKey string
|
|
|
|
var mobile string
|
|
|
|
//var mobile string
|
|
|
|
// 定义用户信息
|
|
|
|
// 定义用户信息
|
|
|
|
var user entity.User
|
|
|
|
var user entity.User
|
|
|
|
switch loginType {
|
|
|
|
switch loginType {
|
|
|
|
case constant.LoginTypeWeChatMiniApp:
|
|
|
|
case constant.LoginTypeWeChatMiniApp:
|
|
|
|
mobile, err = utils.WeChatUtils().GetPhoneNumber(account)
|
|
|
|
//mobile, err = utils.WeChatUtils().GetPhoneNumber(account)
|
|
|
|
if err != nil {
|
|
|
|
//if err != nil {
|
|
|
|
return
|
|
|
|
// return
|
|
|
|
}
|
|
|
|
//}
|
|
|
|
if mobile == "" {
|
|
|
|
//if mobile == "" {
|
|
|
|
err = errors.New("获取手机号失败")
|
|
|
|
// err = errors.New("获取手机号失败")
|
|
|
|
return
|
|
|
|
// return
|
|
|
|
}
|
|
|
|
//}
|
|
|
|
user.Phone = mobile
|
|
|
|
//user.Phone = mobile
|
|
|
|
user.Nickname = nikeName
|
|
|
|
user.Nickname = nikeName
|
|
|
|
user.Avatar = avatarUrl
|
|
|
|
user.Avatar = avatarUrl
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
user.Phone = account
|
|
|
|
//user.Phone = account
|
|
|
|
user.Nickname = nikeName
|
|
|
|
user.Nickname = nikeName
|
|
|
|
user.Avatar = avatarUrl
|
|
|
|
user.Avatar = avatarUrl
|
|
|
|
}
|
|
|
|
}
|
|
|
|