From 644b410ae72c82e68296ea7828ea4d4787a1c83a Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Mon, 3 Jul 2023 18:18:02 +0800
Subject: [PATCH] wxlogin

---
 business/auth2/authprovider/defauther.go | 29 ++++++++++++++++--------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go
index 41970abcc..e0893f82d 100644
--- a/business/auth2/authprovider/defauther.go
+++ b/business/auth2/authprovider/defauther.go
@@ -7,8 +7,6 @@ import (
 	"strings"
 	"time"
 
-	"git.rosy.net.cn/jx-callback/globals"
-
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/auth2"
 	"git.rosy.net.cn/jx-callback/business/model"
@@ -80,14 +78,25 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu
 	} else if dao.IsNoRowsError(err) { // 直接找不到，尝试unionID
 		if unionID != "" || openID != "" { // 且有unionID
 			var authBindList []*model.AuthBind
-			authBindList, err = dao.GetUserBindAuthInfo(db, "", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID, nil)
-			globals.SugarLogger.Debugf("dao.IsNoRowsError authBindList=%s", utils.Format4Output(authBindList, false))
-			globals.SugarLogger.Debugf("dao.IsNoRowsError openID=%s, unionID=%s", openID, unionID)
-			if err != nil {
-				globals.SugarLogger.Debugf("dao.IsNoRowsError err=%v", err)
-				return nil, err
-			}
-			if len(authBindList) > 0 { // 通过unionID找到至少一个认证方式
+			//authBindList, err = dao.GetUserBindAuthInfo(db, "", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID, nil)
+			//if err != nil {
+			//	return nil, err
+			//}
+			//if len(authBindList) > 0 { // 通过unionID找到至少一个认证方式
+			//	authBind = authBindList[0]
+			//	authBind.Type = curAuthType
+			//	authBind.TypeID = curAuthTypeID
+			//	authBind.AuthID = openID
+			//	if authDetail != nil {
+			//		authBind.DetailData = string(utils.MustMarshal(authDetail))
+			//	}
+			//	authBindEx = &auth2.AuthBindEx{
+			//		AuthBind: *authBind,
+			//	}
+			//	a.UnbindAuth(authBind.UserID, curAuthType, curAuthTypeID, model.AdminName)
+			//	err = a.AddAuthBind(authBindEx, model.AdminName) // 自动绑定
+			//}
+			if authBindList, err = dao.GetUserBindAuthInfo(db, "", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID, nil); err == nil && len(authBindList) > 0 { // 通过unionID找到至少一个认证方式
 				authBind = authBindList[0]
 				authBind.Type = curAuthType
 				authBind.TypeID = curAuthTypeID