liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
邹宗楠
2023-07-04 10:49:17 +08:00
parent 5d6e93d64b 4debcc1c5d
commit 73b63e67fe
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/auth2/auth2.go
View File

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

9
controllers/auth2.go
View File

@@ -3,10 +3,12 @@ package controllers
import ( import (
"encoding/base64" "encoding/base64"
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/business/jxstore/cms"
"net/http" "net/http"
"strings" "strings"
"git.rosy.net.cn/jx-callback/business/jxstore/cms"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/baseapi/platformapi/weixinapi" "git.rosy.net.cn/baseapi/platformapi/weixinapi"
@@ -153,7 +155,12 @@ func (c *Auth2Controller) Login() {
} }
if params.CId != "" && authInfo != nil { if params.CId != "" && authInfo != nil {
err = cms.SetUserCId(authInfo.UserID, params.CId) err = cms.SetUserCId(authInfo.UserID, params.CId)
if dao.IsNoRowsError(err) {
err = nil
} }
globals.SugarLogger.Debugf("SetUserCId err=%v", err)
}
globals.SugarLogger.Debugf("Login retVal=%s,err=%v", utils.Format4Output(retVal, false), err)
return retVal, "", err return retVal, "", err
}) })
} }