From cd84cbdfd29d7b678d5f52dbba1bd6c55add972f Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 13 Aug 2019 11:23:36 +0800
Subject: [PATCH] =?UTF-8?q?-=20auth2=E4=B8=8Eauth=E5=9C=A8=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=99=BB=E5=BD=95=E6=88=90=E5=8A=9F=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9C=89=E5=BF=85=E8=A6=81=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?openID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/auth2/authprovider/defauther.go  | 1 +
 business/jxcallback/auth/weixin/weixin.go | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go
index bfe816ba3..75280b16c 100644
--- a/business/auth2/authprovider/defauther.go
+++ b/business/auth2/authprovider/defauther.go
@@ -77,6 +77,7 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType string, unionAuthTypeList []st
 				authBindEx = &auth2.AuthBindEx{
 					AuthBind: *authBind,
 				}
+				a.UnbindAuth(authBind.UserID, curAuthType, model.AdminName)
 				err = a.AddAuthBind(authBindEx, model.AdminName) // 自动绑定
 			} else if dao.IsNoRowsError(err) {
 				err = nil
diff --git a/business/jxcallback/auth/weixin/weixin.go b/business/jxcallback/auth/weixin/weixin.go
index 30e2db587..ec3f4346b 100644
--- a/business/jxcallback/auth/weixin/weixin.go
+++ b/business/jxcallback/auth/weixin/weixin.go
@@ -228,6 +228,10 @@ func (a *AutherMiniProgram) Login(mobileNum, code string) (userID, LoginType str
 	if err != nil {
 		return "", "", auth.ConvertErr2NoUser(err, mobileNum)
 	}
+	if user.OpenIDMini != sessionInfo.OpenID {
+		user.OpenIDMini = sessionInfo.OpenID
+		dao.UpdateEntity(db, user, "OpenIDMini")
+	}
 	globals.SugarLogger.Debugf("AutherMiniProgram Login user.Tel:%s, code:%s, openID:%s", user.Tel, code, sessionInfo.OpenID)
 	if mobileNum != user.Tel {