|
@@ -29,9 +29,26 @@ func (this *WechatCommonController) WechatLogin() {
|
|
|
this.Data["json"] = br
|
|
|
this.ServeJSON()
|
|
|
}()
|
|
|
+ resp := new(models.WxLoginResp)
|
|
|
+
|
|
|
code := this.GetString("Code")
|
|
|
fmt.Println("code:", code)
|
|
|
utils.FileLog.Info("WechatLogin code:%s", code)
|
|
|
+ wxCodeInfo, err := models.GetWxUserCode(code)
|
|
|
+ if err == nil && wxCodeInfo != nil && wxCodeInfo.Id > 0 {
|
|
|
+ utils.FileLog.Info("WechatLogin code exist:%s", code)
|
|
|
+ resp.UserId = wxCodeInfo.UserId
|
|
|
+ resp.Code = 0
|
|
|
+ resp.FirstLogin = wxCodeInfo.FirstLogin
|
|
|
+ resp.Authorization = wxCodeInfo.Authorization
|
|
|
+ resp.UserPermission = wxCodeInfo.UserPermission
|
|
|
+ br.Ret = 200
|
|
|
+ br.Success = true
|
|
|
+ br.Msg = "登录成功"
|
|
|
+ br.Data = resp
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
item, err := services.WxGetUserOpenIdByCode(code)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取用户信息失败"
|
|
@@ -176,7 +193,18 @@ func (this *WechatCommonController) WechatLogin() {
|
|
|
loginLog.Remark = token
|
|
|
go models.AddWxUserLog(loginLog)
|
|
|
}
|
|
|
- resp := new(models.WxLoginResp)
|
|
|
+
|
|
|
+ {
|
|
|
+ codeLog := new(models.WxUserCode)
|
|
|
+ codeLog.WxCode = code
|
|
|
+ codeLog.UserId = userId
|
|
|
+ codeLog.Code = 0
|
|
|
+ codeLog.FirstLogin = firstLogin
|
|
|
+ codeLog.Authorization = token
|
|
|
+ codeLog.UserPermission = permission
|
|
|
+ models.AddWxUserCode(codeLog)
|
|
|
+ }
|
|
|
+
|
|
|
resp.UserId = userId
|
|
|
resp.Code = 0
|
|
|
resp.FirstLogin = firstLogin
|