|
@@ -182,40 +182,40 @@ func (this *WechatCommonController) WechatLogin() {
|
|
|
br.ErrMsg = "获取用户信息失败,code:" + strconv.Itoa(wxInfo.ErrCode) + ",msg:" + wxInfo.ErrMSG
|
|
|
return
|
|
|
}
|
|
|
- wxToken, err := services.WxGetToken()
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取用户信息失败"
|
|
|
- br.ErrMsg = "获取access_token失败,err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
- if wxToken.AccessToken == "" {
|
|
|
- br.Msg = "获取用户信息失败"
|
|
|
- br.ErrMsg = "access_token 为空,"
|
|
|
- return
|
|
|
- }
|
|
|
- getWxUserInfo, err := services.WxGetUserInfo(wxInfo.OpenID, wxToken.AccessToken)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取用户信息失败"
|
|
|
- br.ErrMsg = "获取微信用户信息失败,Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
- if getWxUserInfo.Errcode != 0 {
|
|
|
- userInfoJson, _ := json.Marshal(getWxUserInfo)
|
|
|
- br.Msg = "登录失败"
|
|
|
- br.ErrMsg = "获取用户信息失败,err:" + string(userInfoJson)
|
|
|
- return
|
|
|
- }
|
|
|
+ //wxToken, err := services.WxGetToken()
|
|
|
+ //if err != nil {
|
|
|
+ // br.Msg = "获取用户信息失败"
|
|
|
+ // br.ErrMsg = "获取access_token失败,err:" + err.Error()
|
|
|
+ // return
|
|
|
+ //}
|
|
|
+ //if wxToken.AccessToken == "" {
|
|
|
+ // br.Msg = "获取用户信息失败"
|
|
|
+ // br.ErrMsg = "access_token 为空,"
|
|
|
+ // return
|
|
|
+ //}
|
|
|
+ //getWxUserInfo, err := services.WxGetUserInfo(wxInfo.OpenID, wxToken.AccessToken)
|
|
|
+ //if err != nil {
|
|
|
+ // br.Msg = "获取用户信息失败"
|
|
|
+ // br.ErrMsg = "获取微信用户信息失败,Err:" + err.Error()
|
|
|
+ // return
|
|
|
+ //}
|
|
|
+ //if getWxUserInfo.Errcode != 0 {
|
|
|
+ // userInfoJson, _ := json.Marshal(getWxUserInfo)
|
|
|
+ // br.Msg = "登录失败"
|
|
|
+ // br.ErrMsg = "获取用户信息失败,err:" + string(userInfoJson)
|
|
|
+ // return
|
|
|
+ //}
|
|
|
|
|
|
wxUserInfo := new(services.WxUserInfo)
|
|
|
wxUserInfo.Unionid = wxInfo.UnionID
|
|
|
wxUserInfo.Openid = wxInfo.OpenID
|
|
|
- wxUserInfo.Nickname = getWxUserInfo.Nickname
|
|
|
- wxUserInfo.Headimgurl = getWxUserInfo.Headimgurl
|
|
|
- wxUserInfo.City = getWxUserInfo.City
|
|
|
- wxUserInfo.Province = getWxUserInfo.Province
|
|
|
- wxUserInfo.Country = getWxUserInfo.Country
|
|
|
- wxUserInfo.Sex = getWxUserInfo.Sex
|
|
|
- wxUserInfo.SubscribeScene = getWxUserInfo.SubscribeScene
|
|
|
+ //wxUserInfo.Nickname = getWxUserInfo.Nickname
|
|
|
+ //wxUserInfo.Headimgurl = getWxUserInfo.Headimgurl
|
|
|
+ //wxUserInfo.City = getWxUserInfo.City
|
|
|
+ //wxUserInfo.Province = getWxUserInfo.Province
|
|
|
+ //wxUserInfo.Country = getWxUserInfo.Country
|
|
|
+ //wxUserInfo.Sex = getWxUserInfo.Sex
|
|
|
+ //wxUserInfo.SubscribeScene = getWxUserInfo.SubscribeScene
|
|
|
wxUserInfo.Errcode = wxInfo.ErrCode
|
|
|
wxUserInfo.Errmsg = wxInfo.ErrMSG
|
|
|
wxUserInfo.SessionKey = wxInfo.SessionKey
|