liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- debug msg in auth and auth2

Browse Source
This commit is contained in:
gazebo
2019-03-18 16:16:56 +08:00
parent 69cf6d54ff
commit cf2dc1be14
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
controllers/auth2.go
View File

@@ -99,10 +99,12 @@ func (c *Auth2Controller) GetTokenInfo() {
// @Failure 200 {object} controllers.CallResult
// @router /WeixinOAuth2 [get]
func (c *Auth2Controller) WeixinOAuth2() {
var redirectURL string
var (
redirectURL string
callResult *CallResult
)
c.callWeixinOAuth2(func(params *tAuth2WeixinOAuth2Params) (retVal interface{}, errCode string, err error) {
authInfo, err := auth2.Login(weixin.AuthTypeWeixin, params.State, "", params.Code)
var callResult *CallResult
if err == nil {
callResult = &CallResult{
Code: model.ErrCodeSuccess,
@@ -117,7 +119,7 @@ func (c *Auth2Controller) WeixinOAuth2() {
redirectURL = fmt.Sprintf("%s?info=%s", params.Block, base64.StdEncoding.EncodeToString(utils.MustMarshal(callResult)))
return retVal, model.ErrorCodeIgnore, err
})
globals.SugarLogger.Debugf("WeixinOAuth2, redirectURL:%s", redirectURL)
globals.SugarLogger.Debugf("WeixinOAuth2, callResult:%s, redirectURL:%s", utils.Format4Output(callResult, true), redirectURL)
c.Redirect(redirectURL, http.StatusTemporaryRedirect)
}
@@ -130,10 +132,12 @@ func (c *Auth2Controller) WeixinOAuth2() {
// @Failure 200 {object} controllers.CallResult
// @router /WeixinMPOAuth2 [get]
func (c *Auth2Controller) WeixinMPOAuth2() {
var redirectURL string
var (
redirectURL string
callResult *CallResult
)
c.callWeixinMPOAuth2(func(params *tAuth2WeixinMPOAuth2Params) (retVal interface{}, errCode string, err error) {
authInfo, err := auth2.Login(weixin.AuthTypeMP, params.State, "", params.Code)
var callResult *CallResult
if err == nil {
callResult = &CallResult{
Code: model.ErrCodeSuccess,
@@ -148,7 +152,7 @@ func (c *Auth2Controller) WeixinMPOAuth2() {
redirectURL = fmt.Sprintf("%s?info=%s", params.Block, base64.StdEncoding.EncodeToString(utils.MustMarshal(callResult)))
return retVal, model.ErrorCodeIgnore, err
})
globals.SugarLogger.Debugf("WeixinMPOAuth2, redirectURL:%s", redirectURL)
globals.SugarLogger.Debugf("WeixinMPOAuth2, callResult:%s, redirectURL:%s", utils.Format4Output(callResult, true), redirectURL)
c.Redirect(redirectURL, http.StatusTemporaryRedirect)
}
@@ -161,14 +165,16 @@ func (c *Auth2Controller) WeixinMPOAuth2() {
// @Failure 200 {object} controllers.CallResult
// @router /DingDingOAuth2 [get]
func (c *Auth2Controller) DingDingOAuth2() {
var redirectURL string
var (
redirectURL string
callResult *CallResult
)
c.callDingDingOAuth2(func(params *tAuth2DingDingOAuth2Params) (retVal interface{}, errCode string, err error) {
if params.Block == "" {
params.Block = params.State
params.State = ""
}
authInfo, err := auth2.Login(dingding.AuthTypeQRCode, params.State, "", params.Code)
var callResult *CallResult
if err == nil {
callResult = &CallResult{
Code: model.ErrCodeSuccess,
@@ -184,9 +190,8 @@ func (c *Auth2Controller) DingDingOAuth2() {
redirectURL = fmt.Sprintf("%s?info=%s", params.Block, base64.StdEncoding.EncodeToString(utils.MustMarshal(callResult)))
}
return retVal, model.ErrorCodeIgnore, err
})
globals.SugarLogger.Debugf("WeixinMPOAuth2, redirectURL:%s", redirectURL)
globals.SugarLogger.Debugf("DingDingOAuth2, callResult:%s, redirectURL:%s", utils.Format4Output(callResult, true), redirectURL)
if redirectURL != "" {
c.Redirect(redirectURL, http.StatusTemporaryRedirect)
}

6
controllers/auth_controller.go
View File

@@ -60,9 +60,9 @@ func (c *AuthController) GetWeiXinUserInfo() {
} else {
retVal.Msg = "没有block"
}
redictURL := fmt.Sprintf("%s?info=%s", block, base64.StdEncoding.EncodeToString(utils.MustMarshal(retVal)))
globals.SugarLogger.Debugf("GetWeiXinUserInfo redictURL:%s", redictURL)
c.Redirect(redictURL, http.StatusTemporaryRedirect)
redirectURL := fmt.Sprintf("%s?info=%s", block, base64.StdEncoding.EncodeToString(utils.MustMarshal(retVal)))
globals.SugarLogger.Debugf("auth GetWeiXinUserInfo retVal:%s, redirectURL:%s", utils.Format4Output(retVal, true), redirectURL)
c.Redirect(redirectURL, http.StatusTemporaryRedirect)
}
// @Title 登录接口