rdluck 4 лет назад
Родитель
Сommit
6ab91eefdc
1 измененных файлов с 8 добавлено и 6 удалено
  1. 8 6
      services/user.go

+ 8 - 6
services/user.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"errors"
+	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
 	"strconv"
@@ -222,6 +223,7 @@ func WxLogin(code, openId, unionId string, wxUserInfo *WxUserInfo) (token string
 	}
 	//firstLogin==1,强制绑定手机号或者邮箱
 	firstLogin = 1
+	fmt.Println("GetWxUserItemByOpenId ", openId)
 	wxUser, wxUserErr := GetWxUserItemByOpenId(openId)
 	if wxUserErr == ERR_NO_USER_RECORD { //没有用户openid记录
 		_, recordErr := AddUserRecord(openId, unionId, wxUserInfo.Nickname, "", wxUserInfo.Province, wxUserInfo.City, wxUserInfo.Country, wxUserInfo.Headimgurl, wxUserInfo.SessionKey, utils.WxPlatform, wxUserInfo.Sex, 0)
@@ -234,13 +236,13 @@ func WxLogin(code, openId, unionId string, wxUserInfo *WxUserInfo) (token string
 		err = wxUserErr
 		return
 	}
-
+	fmt.Println("line 239 ", openId)
 	//如果已经登录注册绑定的情况下
 	if wxUser != nil && wxUserErr == nil {
 		//获取用户权限
 		firstLogin = wxUser.FirstLogin
 		userId = wxUser.UserId
-		if wxUserInfo != nil {
+		if wxUserInfo != nil && wxUserInfo.Nickname != "" {
 			go models.ModifyUserRecordInfo(openId, wxUserInfo.Nickname, wxUserInfo.Headimgurl, wxUserInfo.City, wxUserInfo.Province, wxUserInfo.Country, wxUserInfo.Sex, userId)
 		}
 
@@ -253,7 +255,7 @@ func WxLogin(code, openId, unionId string, wxUserInfo *WxUserInfo) (token string
 			codeLog.Authorization = token
 			codeLog.UserPermission = permission
 			codeLog.CreateTime = time.Now()
-			models.AddWxUserCode(codeLog)
+			go models.AddWxUserCode(codeLog)
 		}
 		if wxUser.Mobile == "" && wxUser.Email == "" {
 			firstLogin = 1
@@ -266,7 +268,7 @@ func WxLogin(code, openId, unionId string, wxUserInfo *WxUserInfo) (token string
 		err = errors.New("登录失败,获取token失败:" + tokenErr.Error())
 		return
 	}
-
+	fmt.Println("line 271 ", openId)
 	if tokenItem == nil || (tokenErr != nil && tokenErr.Error() == utils.ErrNoRow()) {
 		timeUnix := time.Now().Unix()
 		timeUnixStr := strconv.FormatInt(timeUnix, 10)
@@ -289,7 +291,7 @@ func WxLogin(code, openId, unionId string, wxUserInfo *WxUserInfo) (token string
 	} else {
 		token = tokenItem.AccessToken
 	}
-
+	fmt.Println("line 294 ", token)
 	//新增登录日志
 	{
 		loginLog := new(models.WxUserLog)
@@ -297,7 +299,7 @@ func WxLogin(code, openId, unionId string, wxUserInfo *WxUserInfo) (token string
 		loginLog.OpenId = openId
 		loginLog.UnionId = unionId
 		loginLog.CreateTime = time.Now()
-		loginLog.Handle = "wechat_login"
+		loginLog.Handle = "wechat_login_cygx"
 		loginLog.Remark = token
 		go models.AddWxUserLog(loginLog)
 	}