From cd8c78cc0832443930ef488c9d71fe91ce6202dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 27 May 2024 10:41:35 +0800 Subject: [PATCH] 1 --- business/auth2/auth2.go | 6 +++++- business/auth2/authprovider/dingding/qrcode.go | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 401a05efd..d6f29f547 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -5,6 +5,7 @@ import ( "encoding/base64" "encoding/json" "errors" + "git.rosy.net.cn/jx-callback/globals" "regexp" "strings" "time" @@ -248,7 +249,10 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string } realAuthID = user.GetID() } - if authBindEx, err = handler.VerifySecret(realAuthID, authSecret); err == nil { + authBindEx, err = handler.VerifySecret(realAuthID, authSecret) + globals.SugarLogger.Debugf("============authBindEx := %s", utils.Format4Output(authBindEx, false)) + globals.SugarLogger.Debugf("============authBindEx := %v", err) + if err == nil { if authBindEx == nil { // mobile, email会返回nil（表示不会新建AuthBind实体） user = userProvider.GetUser(authID, authIDType) authBindEx = &AuthBindEx{ diff --git a/business/auth2/authprovider/dingding/qrcode.go b/business/auth2/authprovider/dingding/qrcode.go index 262e8a7be..a80a7ddcb 100644 --- a/business/auth2/authprovider/dingding/qrcode.go +++ b/business/auth2/authprovider/dingding/qrcode.go @@ -4,6 +4,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/auth2" "git.rosy.net.cn/jx-callback/business/auth2/authprovider" + "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" ) @@ -22,18 +23,26 @@ func init() { func (a *QRCodeAuther) VerifySecret(dummy, code string) (*auth2.AuthBindEx, error) { userQRInfo, err := api.DingDingQRCodeAPI.GetUserInfoByCode(code) + globals.SugarLogger.Debugf("=========userQRInfo= := %s", utils.Format4Output(userQRInfo, false)) + globals.SugarLogger.Debugf("=========err= := %v", err) if err != nil { return nil, err } tmp_userID, err := api.DingDingAPI.GetByUnionID(userQRInfo.UnionID) + globals.SugarLogger.Debugf("=========userQRInfo= := %s", utils.Format4Output(tmp_userID, false)) + globals.SugarLogger.Debugf("=========err= := %v", err) if err != nil { return nil, err } userInfo, err := api.DingDingAPI.GetUser(tmp_userID.UserID) + globals.SugarLogger.Debugf("=========userInfo= := %s", utils.Format4Output(userInfo, false)) + globals.SugarLogger.Debugf("=========err= := %v", err) if err != nil { return nil, err } authBindEx, err := a.UnionFindAuthBind(AuthTypeQRCode, api.DingDingQRCodeAPI.GetAppID(), []string{AuthTypeStaff, AuthTypeQRCode}, userQRInfo.OpenID, userQRInfo.UnionID, userQRInfo) + globals.SugarLogger.Debugf("=========authBindEx= := %s", utils.Format4Output(authBindEx, false)) + globals.SugarLogger.Debugf("=========err= := %v", err) if err != nil { return nil, err } @@ -43,5 +52,8 @@ func (a *QRCodeAuther) VerifySecret(dummy, code string) (*auth2.AuthBindEx, erro Email: utils.Interface2String(userInfo["email"]), Name: utils.Interface2String(userInfo["name"]), } + + globals.SugarLogger.Debugf("=========authBindEx2= := %s", utils.Format4Output(authBindEx, false)) + globals.SugarLogger.Debugf("=========err= := %v", err) return authBindEx, err }