🐛 fix bug

This commit is contained in:
loser 2023-05-17 21:28:54 +08:00
parent 27daf68736
commit c6ac5c15da
2 changed files with 14 additions and 14 deletions

View File

@ -4,6 +4,7 @@ import (
"Lee-WineList/config"
"Lee-WineList/core"
"Lee-WineList/initialize"
"Lee-WineList/oauth2"
appRoute "Lee-WineList/router"
"fmt"
"git.echol.cn/loser/logger/log"
@ -17,8 +18,8 @@ var g errgroup.Group
// 系统初始化
func init() {
initialize.InitSystem() // 初始化系统配置
//oauth2.InitOAuth2Server() // 初始化OAuth2服务
initialize.InitSystem() // 初始化系统配置
oauth2.InitOAuth2Server() // 初始化OAuth2服务
}
// 启动入口

View File

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