From 4572dcf288508cb0ad29f0f345f310491cef0224 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Fri, 12 Aug 2022 15:13:26 +0800
Subject: [PATCH] dd

---
 .../auth2/authprovider/dingding/qrcode.go     | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/business/auth2/authprovider/dingding/qrcode.go b/business/auth2/authprovider/dingding/qrcode.go
index 274815570..14b4933ed 100644
--- a/business/auth2/authprovider/dingding/qrcode.go
+++ b/business/auth2/authprovider/dingding/qrcode.go
@@ -21,30 +21,32 @@ func init() {
 	auth2.RegisterAuther(AuthTypeQRCode, AutherObjQRCode)
 }
 
-func (a *QRCodeAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthBindEx, err error) {
+func (a *QRCodeAuther) VerifySecret(dummy, code string) (*auth2.AuthBindEx, error) {
 	globals.SugarLogger.Debugf("dingding qrcode VerifySecret code:%s", code)
-
 	userQRInfo, err := api.DingDingQRCodeAPI.GetUserInfoByCode(code)
-	if err == nil {
-		tmp_userID, err := api.DingDingAPI.GetByUnionID(userQRInfo.UnionID)
-		if err != nil {
-			return nil, err
-		}
-		userInfo, err := api.DingDingAPI.GetUser(tmp_userID.UserID)
-		if err != nil {
-			return nil, err
-		}
-		globals.SugarLogger.Debug("tmp_userID====,userInfo=======", tmp_userID, userInfo)
-		globals.SugarLogger.Debugf("dingding qrcode VerifySecret code:%s, userQRInfo:%s", code, utils.Format4Output(userQRInfo, false))
-		if authBindEx, err = a.UnionFindAuthBind(AuthTypeQRCode, api.DingDingQRCodeAPI.GetAppID(), []string{AuthTypeStaff, AuthTypeQRCode}, userQRInfo.OpenID, userQRInfo.UnionID, userQRInfo); err == nil {
-			authBindEx.UserHint = &auth2.UserBasic{
-				//Name: userQRInfo.Nickname,
-				UserID2: tmp_userID.UserID,
-				Mobile:  utils.Interface2String(userInfo["mobile"]),
-				Email:   utils.Interface2String(userInfo["email"]),
-				Name:    utils.Interface2String(userInfo["name"]),
-			}
-		}
+	if err != nil {
+		return nil, err
+	}
+	tmp_userID, err := api.DingDingAPI.GetByUnionID(userQRInfo.UnionID)
+	if err != nil {
+		return nil, err
+	}
+	userInfo, err := api.DingDingAPI.GetUser(tmp_userID.UserID)
+	if err != nil {
+		return nil, err
+	}
+	globals.SugarLogger.Debug("tmp_userID====,userInfo=======", tmp_userID, userInfo)
+	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
+	}
+	authBindEx.UserHint = &auth2.UserBasic{
+		//Name: userQRInfo.Nickname,
+		UserID2: tmp_userID.UserID,
+		Mobile:  utils.Interface2String(userInfo["mobile"]),
+		Email:   utils.Interface2String(userInfo["email"]),
+		Name:    utils.Interface2String(userInfo["name"]),
 	}
 	globals.SugarLogger.Debug("authBindEx.UserHint===============", authBindEx.UserHint)
 	return authBindEx, err