✨ init user created with avatar
This commit is contained in:
@@ -214,6 +214,7 @@ func (OAuthAPI) GiteeCallback(c *gin.Context) {
|
||||
Avatar: &giteeUser.AvatarURL,
|
||||
Blog: &giteeUser.Blog,
|
||||
Email: &giteeUser.Email,
|
||||
Gender: &enum.Male,
|
||||
}
|
||||
addUser, err := userService.AddUser(user)
|
||||
if err != nil {
|
||||
|
@@ -224,6 +224,7 @@ func (OAuthAPI) Callback(c *gin.Context) {
|
||||
Avatar: &gitHubUser.AvatarURL,
|
||||
Blog: &gitHubUser.Blog,
|
||||
Email: &gitHubUser.Email,
|
||||
Gender: &enum.Male,
|
||||
}
|
||||
addUser, err := userService.AddUser(user)
|
||||
if err != nil {
|
||||
|
@@ -260,14 +260,12 @@ func (OAuthAPI) QQCallback(c *gin.Context) {
|
||||
// 第一次登录,创建用户
|
||||
uid := idgen.NextId()
|
||||
uidStr := strconv.FormatInt(uid, 10)
|
||||
location := qqUserInfo.Province + "|" + qqUserInfo.City
|
||||
user := model.ScaAuthUser{
|
||||
UID: &uidStr,
|
||||
Username: &authQQme.OpenID,
|
||||
Nickname: &qqUserInfo.Nickname,
|
||||
Avatar: &qqUserInfo.FigureurlQq1,
|
||||
Gender: &qqUserInfo.Gender,
|
||||
Location: &location,
|
||||
}
|
||||
addUser, err := userService.AddUser(user)
|
||||
if err != nil {
|
||||
|
@@ -9,6 +9,7 @@ import (
|
||||
"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/messages"
|
||||
models2 "github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/models"
|
||||
"github.com/ArtisanCloud/PowerWeChat/v3/src/officialAccount/server/handlers/models"
|
||||
"github.com/DanPlayer/randomname"
|
||||
ginI18n "github.com/gin-contrib/i18n"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/yitter/idgenerator-go/idgen"
|
||||
@@ -179,9 +180,17 @@ func wechatLoginHandler(openId string, clientId string) bool {
|
||||
|
||||
uid := idgen.NextId()
|
||||
uidStr := strconv.FormatInt(uid, 10)
|
||||
avatar, err := utils.GenerateAvatar(uidStr)
|
||||
name := randomname.GenerateName()
|
||||
if err != nil {
|
||||
global.LOG.Errorln(err)
|
||||
return false
|
||||
}
|
||||
createUser := model.ScaAuthUser{
|
||||
UID: &uidStr,
|
||||
Username: &openId,
|
||||
Avatar: &avatar,
|
||||
Nickname: &name,
|
||||
}
|
||||
|
||||
// 异步添加用户
|
||||
@@ -193,7 +202,7 @@ func wechatLoginHandler(openId string, clientId string) bool {
|
||||
errChan <- err
|
||||
return
|
||||
}
|
||||
addUserChan <- &addUser
|
||||
addUserChan <- addUser
|
||||
}()
|
||||
|
||||
var addUser *model.ScaAuthUser
|
||||
|
@@ -2,6 +2,7 @@ package user_api
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"github.com/DanPlayer/randomname"
|
||||
ginI18n "github.com/gin-contrib/i18n"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/mssola/useragent"
|
||||
@@ -198,9 +199,19 @@ func (UserAPI) PhoneLogin(c *gin.Context) {
|
||||
|
||||
uid := idgen.NextId()
|
||||
uidStr := strconv.FormatInt(uid, 10)
|
||||
|
||||
avatar, err := utils.GenerateAvatar(uidStr)
|
||||
if err != nil {
|
||||
global.LOG.Errorln(err)
|
||||
return
|
||||
}
|
||||
name := randomname.GenerateName()
|
||||
createUser := model.ScaAuthUser{
|
||||
UID: &uidStr,
|
||||
Phone: &phone,
|
||||
UID: &uidStr,
|
||||
Phone: &phone,
|
||||
Avatar: &avatar,
|
||||
Nickname: &name,
|
||||
Gender: &enum.Male,
|
||||
}
|
||||
|
||||
errChan := make(chan error)
|
||||
@@ -214,13 +225,13 @@ func (UserAPI) PhoneLogin(c *gin.Context) {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
handelUserLogin(addUser, autoLogin, c)
|
||||
handelUserLogin(*addUser, autoLogin, c)
|
||||
return nil
|
||||
})
|
||||
errChan <- err
|
||||
}()
|
||||
|
||||
err := <-errChan
|
||||
err = <-errChan
|
||||
close(errChan)
|
||||
|
||||
if err != nil {
|
||||
|
Reference in New Issue
Block a user