Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

This commit is contained in:
邹宗楠
2023-07-04 10:49:17 +08:00
2 changed files with 12 additions and 1 deletions

View File

@@ -9,6 +9,8 @@ import (
"strings"
"time"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
@@ -309,6 +311,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string
if appID == model.JXC4ClientAppID && authInfo.AuthBindInfo.UserID != "" {
binds, err := dao.GetUserBindAuthInfo(dao.GetDB(), authInfo.AuthBindInfo.UserID, 0, nil, "", "", []string{model.JXC4ClientAppID})
if err != nil {
globals.SugarLogger.Debugf("AuthTypeWXApp authInfo=%s,err=%v", utils.Format4Output(authInfo, false), err)
return authInfo, err
}
if len(binds) == 0 {
@@ -324,6 +327,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string
} else {
err = ErrIllegalAuthType
}
globals.SugarLogger.Debugf("LoginInternal authInfo=%s", utils.Format4Output(authInfo, false))
return authInfo, err
}