diff --git a/controllers/auth2_contoller.go b/controllers/auth2_contoller.go index d4828d04b..cf3ac9ede 100644 --- a/controllers/auth2_contoller.go +++ b/controllers/auth2_contoller.go @@ -161,35 +161,15 @@ func (c *Auth2Controller) WeixinOAuth2() { // @Title 微信公众号认证回调接口 // @Description 微信公众号认证回调接口,自己不能直接调用 // @Param code query string true "客户同意后得到的code" -// @Param block query string true "回调地址" -// @Param state query string false "微信回调的登录状态" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /WeixinMPOAuth2 [get] func (c *Auth2Controller) WeixinMPOAuth2() { - var ( - redirectURL string - callResult *CallResult - ) c.callWeixinMPOAuth2(func(params *tAuth2WeixinMPOAuth2Params) (retVal interface{}, errCode string, err error) { ctx := auth2.NewContext(c.Ctx.ResponseWriter, c.Ctx.Request) - authInfo, err := auth2.Login(ctx, weixin.AuthTypeMP, params.State, "", params.Code) - if err == nil { - callResult = &CallResult{ - Code: model.ErrCodeSuccess, - Data: string(utils.MustMarshal(authInfo)), - } - } else { - callResult = &CallResult{ - Code: model.ErrCodeGeneralFailed, - Desc: err.Error(), - } - } - redirectURL = fmt.Sprintf("%s?info=%s", params.Block, base64.StdEncoding.EncodeToString(utils.MustMarshal(callResult))) - return retVal, model.ErrorCodeIgnore, err + authInfo, err := auth2.Login(ctx, weixin.AuthTypeMP, "", "", params.Code) + return authInfo, "", err }) - globals.SugarLogger.Debugf("WeixinMPOAuth2, callResult:%s, redirectURL:%s", utils.Format4Output(callResult, true), redirectURL) - c.Redirect(redirectURL, http.StatusTemporaryRedirect) } // @Title 钉钉认证回调接口