log delete

business/auth2/authprovider/dingding/qrcode.go

@@ -4,7 +4,6 @@ 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"
 )
 
@@ -34,7 +33,6 @@ func (a *QRCodeAuther) VerifySecret(dummy, code string) (*auth2.AuthBindEx, erro
 	if err != nil {
 		return nil, err
 	}
-	globals.SugarLogger.Debugf("dingding qrcode VerifySecret code:%s, userQRInfo:%s", code, utils.Format4Output(userQRInfo, false))
 	authBindEx, err := a.UnionFindAuthBind(AuthTypeQRCode, api.DingDingQRCodeAPI.GetAppID(), []string{AuthTypeStaff, AuthTypeQRCode}, userQRInfo.OpenID, userQRInfo.UnionID, userQRInfo)
 	if err != nil {
 		return nil, err

business/auth2/authprovider/dingding/staff.go

@@ -22,7 +22,10 @@ func init() {
 }
 
 func (a *StaffAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthBindEx, err error) {
+<<<<<<< HEAD
 
+=======
+>>>>>>> b751c9442459defeaf01c6881116e08f1d8f0b47
 	userID, err := api.DingDingAPI.GetUserID(code)
 	if err == nil {
 		userDetail, err2 := api.DingDingAPI.GetUserDetail(userID.UserID)