aa
This commit is contained in:
@@ -4,7 +4,6 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
@@ -279,16 +278,12 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string
|
|||||||
if user != nil && user.GetID() != "" {
|
if user != nil && user.GetID() != "" {
|
||||||
userProvider.UpdateLastLogin(user.GetID(), authType, ctx.GetRealRemoteIP())
|
userProvider.UpdateLastLogin(user.GetID(), authType, ctx.GetRealRemoteIP())
|
||||||
}
|
}
|
||||||
fmt.Println("11111111111111111", authType)
|
|
||||||
//如果是小程序
|
//如果是小程序
|
||||||
if authType == "weixinmini" || authType == "weixinapp" {
|
if authType == "weixinmini" || authType == "weixinapp" {
|
||||||
appID := strings.Split(authSecret, ",")[0]
|
appID := strings.Split(authSecret, ",")[0]
|
||||||
fmt.Println("22222222222222222222222222", appID)
|
|
||||||
if appID == "wx08a5c2a8581414ff" || appID == "wx2d6949f724b2541d" || appID == "wx18111a41fd17f24f" || appID == "wx4b5930c13f8b1170" { //菜市或者果园
|
if appID == "wx08a5c2a8581414ff" || appID == "wx2d6949f724b2541d" || appID == "wx18111a41fd17f24f" || appID == "wx4b5930c13f8b1170" { //菜市或者果园
|
||||||
fmt.Println("333333333333333333333333333", authInfo.AuthBindInfo.UserID)
|
|
||||||
if authInfo.AuthBindInfo.UserID != "" {
|
if authInfo.AuthBindInfo.UserID != "" {
|
||||||
binds, err := dao.GetUserBindAuthInfo(dao.GetDB(), authInfo.AuthBindInfo.UserID, 0, nil, "", "", []string{"wx2bb99eb5d2c9b82c", "wx4b5930c13f8b1170"})
|
binds, err := dao.GetUserBindAuthInfo(dao.GetDB(), authInfo.AuthBindInfo.UserID, 0, nil, "", "", []string{"wx2bb99eb5d2c9b82c", "wx4b5930c13f8b1170"})
|
||||||
fmt.Println("444444444444444444444444", utils.Format4Output(binds, true))
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return authInfo, err
|
return authInfo, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri
|
|||||||
sqlParams = append(sqlParams, authID2)
|
sqlParams = append(sqlParams, authID2)
|
||||||
}
|
}
|
||||||
if len(typeIDs) > 0 {
|
if len(typeIDs) > 0 {
|
||||||
sql += " AND t1.type IN (" + GenQuestionMarks(len(typeIDs)) + ")"
|
sql += " AND t1.type_id IN (" + GenQuestionMarks(len(typeIDs)) + ")"
|
||||||
sqlParams = append(sqlParams, typeIDs)
|
sqlParams = append(sqlParams, typeIDs)
|
||||||
}
|
}
|
||||||
sql += " ORDER BY t1.type"
|
sql += " ORDER BY t1.type"
|
||||||
|
|||||||
Reference in New Issue
Block a user