From d029659628670340b3362df423d32b3fbbf3f0e4 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Aug 2022 14:13:49 +0800 Subject: [PATCH 01/57] dd --- business/auth2/auth2.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 2d96e8e5e..9873a462b 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -278,7 +278,9 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string user = userProvider.GetUser(authBindEx.UserID, UserIDID) } } + globals.SugarLogger.Debug("输出authBindEx", authBindEx) authInfo = createAuthInfo(user, authBindEx) + globals.SugarLogger.Debug("输出authInfo", authInfo) if user != nil && user.GetID() != "" { userProvider.UpdateLastLogin(user.GetID(), authType, ctx.GetRealRemoteIP()) } From 766bfaeb5e2f2bc08103e5091ab059bafc3ccda6 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Aug 2022 14:22:41 +0800 Subject: [PATCH 02/57] dd --- business/auth2/auth2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 9873a462b..63cbdcbad 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -278,7 +278,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string user = userProvider.GetUser(authBindEx.UserID, UserIDID) } } - globals.SugarLogger.Debug("输出authBindEx", authBindEx) + globals.SugarLogger.Debug("输出authBindEx,user", authBindEx, user) authInfo = createAuthInfo(user, authBindEx) globals.SugarLogger.Debug("输出authInfo", authInfo) if user != nil && user.GetID() != "" { From 4acbe9003872fc22435e533bcfa4bb847898fab2 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Aug 2022 14:29:21 +0800 Subject: [PATCH 03/57] dd --- business/auth2/auth2.go | 2 ++ business/auth2/authprovider/defauther.go | 14 -------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 63cbdcbad..7eded3cac 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -251,6 +251,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string globals.SugarLogger.Debugf("Login authBindEx", utils.Format4Output(authBindEx, false)) if authBindEx == nil { // mobile, email会返回nil（表示不会新建AuthBind实体） user = userProvider.GetUser(authID, authIDType) + globals.SugarLogger.Debug("user第一次===================", user) authBindEx = &AuthBindEx{ AuthBind: model.AuthBind{ Type: authType, @@ -277,6 +278,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string } else if authBindEx.UserID != "" { user = userProvider.GetUser(authBindEx.UserID, UserIDID) } + globals.SugarLogger.Debug("user第二次=============", user) } globals.SugarLogger.Debug("输出authBindEx,user", authBindEx, user) authInfo = createAuthInfo(user, authBindEx) diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index 9c1310336..d4836f048 100644 --- a/business/auth2/authprovider/defauther.go +++ b/business/auth2/authprovider/defauther.go @@ -75,9 +75,6 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu if authDetail != nil { authBindEx.DetailData = string(utils.MustMarshal(authDetail)) } - globals.SugarLogger.Debug("检查一下数据样式===================", authBindEx) - globals.SugarLogger.Debug("检查一下数据样式===================", authDetail) - globals.SugarLogger.Debug("检查一下数据样式===================", authBindEx.DetailData) if authBind.TypeID == "" { authBind.TypeID = curAuthTypeID dao.UpdateEntity(db, authBind, "TypeID") @@ -85,16 +82,11 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu } else if dao.IsNoRowsError(err) { // 直接找不到，尝试unionID if unionID != "" || openID != "" { // 且有unionID var authBindList []*model.AuthBind - globals.SugarLogger.Debug("输出一下", unionAuthTypeList) - globals.SugarLogger.Debug("=====================输出一下model.AuthBindTypeAuth,openID,unionID", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID) authBindList, err = dao.GetUserBindAuthInfo(db, "", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID, nil) if err != nil { - globals.SugarLogger.Debug("authBindList输出错误", err) return nil, err } - globals.SugarLogger.Debug("检测这个authBindList", authBindList) if len(authBindList) > 0 { // 通过unionID找到至少一个认证方式 - globals.SugarLogger.Debug("进入authBindList, err = dao.GetUserBindAuthInfo 这里了") authBind = authBindList[0] authBind.Type = curAuthType authBind.TypeID = curAuthTypeID @@ -105,20 +97,16 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu authBindEx = &auth2.AuthBindEx{ AuthBind: *authBind, } - globals.SugarLogger.Debug("输出赋值后的authBind.DetailData", authBind.DetailData) - globals.SugarLogger.Debug("输出赋值后的authBindEx", authBindEx) a.UnbindAuth(authBind.UserID, curAuthType, curAuthTypeID, model.AdminName) err = a.AddAuthBind(authBindEx, model.AdminName) // 自动绑定 } else if dao.IsNoRowsError(err) { err = nil } - globals.SugarLogger.Debug("输出一下authBindList", authBindList) //空的 } else { err = nil } } if err == nil && authBindEx == nil { //如果没有报错，且没有找到一个认证方式，创建无用户（UserID为空）的认证方式 - globals.SugarLogger.Debug("没有找到一个认证方式") authBindEx = &auth2.AuthBindEx{ AuthBind: model.AuthBind{ Type: curAuthType, @@ -127,8 +115,6 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu AuthID2: unionID, }, } - globals.SugarLogger.Debug("输出一下authBindEx", authBindEx) - globals.SugarLogger.Debug("===================再输出一下authBind", authBind) if authDetail != nil { authBindEx.DetailData = string(utils.MustMarshal(authDetail)) } From 9e1fa883b545c9518b65811f574bd5dc4d437051 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Aug 2022 14:48:58 +0800 Subject: [PATCH 04/57] dd --- business/auth2/auth2.go | 2 ++ business/model/dao/dao_auth2.go | 7 ------- business/model/dao/dao_utils.go | 3 --- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 7eded3cac..c0962be81 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -275,8 +275,10 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { user = user2 } + globals.SugarLogger.Debug("user检测1=============", user) } else if authBindEx.UserID != "" { user = userProvider.GetUser(authBindEx.UserID, UserIDID) + globals.SugarLogger.Debug("user检测2=============", user) } globals.SugarLogger.Debug("user第二次=============", user) } diff --git a/business/model/dao/dao_auth2.go b/business/model/dao/dao_auth2.go index 4fdd2976b..f7e0c8cee 100644 --- a/business/model/dao/dao_auth2.go +++ b/business/model/dao/dao_auth2.go @@ -2,8 +2,6 @@ package dao import ( "errors" - "git.rosy.net.cn/jx-callback/globals" - "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" ) @@ -64,10 +62,5 @@ func GetUserBindAuthInfo(db *DaoDB, userID string, bindType int, typeList []stri } sql += " ORDER BY t1.type" err = GetRows(db, &authList, sql, sqlParams...) - globals.SugarLogger.Debug("输出一下sql", sql) - globals.SugarLogger.Debug("authList==================", authList) - globals.SugarLogger.Debug("param==================", sqlParams) - globals.SugarLogger.Debug("err==================", err) - globals.SugarLogger.Debug("err==================", err) return authList, err } diff --git a/business/model/dao/dao_utils.go b/business/model/dao/dao_utils.go index 3144a5e29..eaca61326 100644 --- a/business/model/dao/dao_utils.go +++ b/business/model/dao/dao_utils.go @@ -2,7 +2,6 @@ package dao import ( "fmt" - "git.rosy.net.cn/jx-callback/globals" "reflect" "strings" "time" @@ -98,8 +97,6 @@ func GenQuestionMarks(count int) (marks string) { marks = builder.String() } } - result := string(marks) - globals.SugarLogger.Debug("输出一下marks", result) return marks } From 81480ffe016d7128616ad67ab5f3f7b1d5c5662b Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Aug 2022 14:52:33 +0800 Subject: [PATCH 05/57] dd --- business/auth2/auth2.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index c0962be81..49f27b3eb 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -263,15 +263,15 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string // 返回authBind中UserID为空表示只是认证，但本地没有记录，这种情况会返回临时TOKEN if authBindEx.UserHint != nil && authBindEx.UserID == "" { // 利用得到受信任的信息查找用户 - // if authBindEx.UserHint.Mobile != "" { - // user = userProvider.GetUser(authBindEx.UserHint.Mobile, UserIDMobile) - // } - // if user == nil && authBindEx.UserHint.Email != "" { - // user = userProvider.GetUser(authBindEx.UserHint.Email, UserIDEmail) - // } - // if user != nil { - // authBindEx.UserID = user.GetID() - // } + if authBindEx.UserHint.Mobile != "" { + user = userProvider.GetUser(authBindEx.UserHint.Mobile, UserIDMobile) + } + if user == nil && authBindEx.UserHint.Email != "" { + user = userProvider.GetUser(authBindEx.UserHint.Email, UserIDEmail) + } + if user != nil { + authBindEx.UserID = user.GetID() + } if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { user = user2 } From f15b85bbe72ebd2b185c767ed0dbe8e35ab68d1c Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Aug 2022 15:06:33 +0800 Subject: [PATCH 06/57] dd --- business/auth2/auth2.go | 20 ++++++++++---------- business/auth2/authprovider/defauther.go | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 49f27b3eb..04c08eaa1 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -83,7 +83,7 @@ type IAuther interface { SendVerifyCode(authID string) (verifyCode string, err error) // 负责验证secret，并找到相应的用户返回（password,email,mobile类型的不负责用户查找）如果找不到用户UserID为空 VerifySecret(authID, authSecret string) (authBindEx *AuthBindEx, err error) - AddAuthBind(authBindEx *AuthBindEx, userName string) (err error) + pay(authBindEx *AuthBindEx, userName string) (err error) UnbindAuth(userID, authType, authTypeID, userName string) (err error) Logout(authInfo *AuthInfo) (err error) GetUserType() (userType int8) @@ -263,15 +263,15 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string // 返回authBind中UserID为空表示只是认证，但本地没有记录，这种情况会返回临时TOKEN if authBindEx.UserHint != nil && authBindEx.UserID == "" { // 利用得到受信任的信息查找用户 - if authBindEx.UserHint.Mobile != "" { - user = userProvider.GetUser(authBindEx.UserHint.Mobile, UserIDMobile) - } - if user == nil && authBindEx.UserHint.Email != "" { - user = userProvider.GetUser(authBindEx.UserHint.Email, UserIDEmail) - } - if user != nil { - authBindEx.UserID = user.GetID() - } + // if authBindEx.UserHint.Mobile != "" { + // user = userProvider.GetUser(authBindEx.UserHint.Mobile, UserIDMobile) + // } + // if user == nil && authBindEx.UserHint.Email != "" { + // user = userProvider.GetUser(authBindEx.UserHint.Email, UserIDEmail) + // } + // if user != nil { + // authBindEx.UserID = user.GetID() + // } if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { user = user2 } diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index d4836f048..bd2bdb608 100644 --- a/business/auth2/authprovider/defauther.go +++ b/business/auth2/authprovider/defauther.go @@ -99,6 +99,7 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu } a.UnbindAuth(authBind.UserID, curAuthType, curAuthTypeID, model.AdminName) err = a.AddAuthBind(authBindEx, model.AdminName) // 自动绑定 + globals.SugarLogger.Debug("authBindEx AddAuthBind err============", authBindEx, err) } else if dao.IsNoRowsError(err) { err = nil } From 3b0c5e6895231969cba6cd03ea1ff93311cdd0ae Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Aug 2022 15:15:05 +0800 Subject: [PATCH 07/57] dd --- business/auth2/auth2.go | 2 +- business/auth2/authprovider/defauther.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 04c08eaa1..c0962be81 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -83,7 +83,7 @@ type IAuther interface { SendVerifyCode(authID string) (verifyCode string, err error) // 负责验证secret，并找到相应的用户返回（password,email,mobile类型的不负责用户查找）如果找不到用户UserID为空 VerifySecret(authID, authSecret string) (authBindEx *AuthBindEx, err error) - pay(authBindEx *AuthBindEx, userName string) (err error) + AddAuthBind(authBindEx *AuthBindEx, userName string) (err error) UnbindAuth(userID, authType, authTypeID, userName string) (err error) Logout(authInfo *AuthInfo) (err error) GetUserType() (userType int8) diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index bd2bdb608..d4836f048 100644 --- a/business/auth2/authprovider/defauther.go +++ b/business/auth2/authprovider/defauther.go @@ -99,7 +99,6 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu } a.UnbindAuth(authBind.UserID, curAuthType, curAuthTypeID, model.AdminName) err = a.AddAuthBind(authBindEx, model.AdminName) // 自动绑定 - globals.SugarLogger.Debug("authBindEx AddAuthBind err============", authBindEx, err) } else if dao.IsNoRowsError(err) { err = nil } From 6c423b65a4638ee1cb3c0a778b008691fe4f21c1 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Aug 2022 16:08:25 +0800 Subject: [PATCH 08/57] dd --- business/auth2/auth2.go | 6 +++++- business/auth2/authprovider/dingding/qrcode.go | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index c0962be81..a4ee4ac0c 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -160,6 +160,7 @@ func getFixedTokenName(token string) *AuthInfo { func createAuthInfo(user IUser, authBindInfo *AuthBindEx) (authInfo *AuthInfo) { token, tokenType := createToken(user, authBindInfo) + globals.SugarLogger.Debug("token，tokenType============", token, tokenType) expireDuration := DefTokenDuration authInfo = &AuthInfo{ AuthBindInfo: authBindInfo, @@ -272,9 +273,12 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string // if user != nil { // authBindEx.UserID = user.GetID() // } - if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { + if user2 := userProvider.GetUser(authBindEx.AuthID2, "auth_id2"); err != nil { user = user2 } + //if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { + // user = user2 + //} globals.SugarLogger.Debug("user检测1=============", user) } else if authBindEx.UserID != "" { user = userProvider.GetUser(authBindEx.UserID, UserIDID) diff --git a/business/auth2/authprovider/dingding/qrcode.go b/business/auth2/authprovider/dingding/qrcode.go index 7d78ac6b1..81392e429 100644 --- a/business/auth2/authprovider/dingding/qrcode.go +++ b/business/auth2/authprovider/dingding/qrcode.go @@ -30,7 +30,7 @@ func (a *QRCodeAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthB if authBindEx, err = a.UnionFindAuthBind(AuthTypeQRCode, api.DingDingQRCodeAPI.GetAppID(), []string{AuthTypeStaff, AuthTypeQRCode}, userQRInfo.OpenID, userQRInfo.UnionID, userQRInfo); err == nil { authBindEx.UserHint = &auth2.UserBasic{ Name: userQRInfo.Nickname, - //UserID: userQRInfo., + //UserID: userQR Info., } } } From 4503993016f559757fe612583f36d3590bf48f22 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Aug 2022 17:34:41 +0800 Subject: [PATCH 09/57] dd --- business/auth2/auth2.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index a4ee4ac0c..07288ae7d 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -273,12 +273,10 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string // if user != nil { // authBindEx.UserID = user.GetID() // } - if user2 := userProvider.GetUser(authBindEx.AuthID2, "auth_id2"); err != nil { + + if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { user = user2 } - //if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { - // user = user2 - //} globals.SugarLogger.Debug("user检测1=============", user) } else if authBindEx.UserID != "" { user = userProvider.GetUser(authBindEx.UserID, UserIDID) From b7db80a5afb38959bbe64b55ffcccb35291c9e72 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Aug 2022 18:15:21 +0800 Subject: [PATCH 10/57] test --- business/auth2/auth2.go | 3 ++- business/auth2/authprovider/defauther.go | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 07288ae7d..066ef3ed2 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -263,6 +263,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string } else { // 返回authBind中UserID为空表示只是认证，但本地没有记录，这种情况会返回临时TOKEN if authBindEx.UserHint != nil && authBindEx.UserID == "" { + globals.SugarLogger.Debug("进入") // 利用得到受信任的信息查找用户 // if authBindEx.UserHint.Mobile != "" { // user = userProvider.GetUser(authBindEx.UserHint.Mobile, UserIDMobile) @@ -273,7 +274,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string // if user != nil { // authBindEx.UserID = user.GetID() // } - + //if user3:=api.DingDingAPI.GetUserID(a) if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { user = user2 } diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index d4836f048..8133e5eb8 100644 --- a/business/auth2/authprovider/defauther.go +++ b/business/auth2/authprovider/defauther.go @@ -80,9 +80,9 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu dao.UpdateEntity(db, authBind, "TypeID") } } else if dao.IsNoRowsError(err) { // 直接找不到，尝试unionID - if unionID != "" || openID != "" { // 且有unionID + if unionID != "" { // 且有unionID var authBindList []*model.AuthBind - authBindList, err = dao.GetUserBindAuthInfo(db, "", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID, nil) + authBindList, err = dao.GetUserBindAuthInfo(db, "", model.AuthBindTypeAuth, unionAuthTypeList, "", unionID, nil) if err != nil { return nil, err } From 8170627fbb8412aa0dcc887a25b1cf24e40bf56d Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 11 Aug 2022 18:17:08 +0800 Subject: [PATCH 11/57] test --- business/auth2/authprovider/defauther.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/auth2/authprovider/defauther.go b/business/auth2/authprovider/defauther.go index 8133e5eb8..d4836f048 100644 --- a/business/auth2/authprovider/defauther.go +++ b/business/auth2/authprovider/defauther.go @@ -80,9 +80,9 @@ func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAu dao.UpdateEntity(db, authBind, "TypeID") } } else if dao.IsNoRowsError(err) { // 直接找不到，尝试unionID - if unionID != "" { // 且有unionID + if unionID != "" || openID != "" { // 且有unionID var authBindList []*model.AuthBind - authBindList, err = dao.GetUserBindAuthInfo(db, "", model.AuthBindTypeAuth, unionAuthTypeList, "", unionID, nil) + authBindList, err = dao.GetUserBindAuthInfo(db, "", model.AuthBindTypeAuth, unionAuthTypeList, openID, unionID, nil) if err != nil { return nil, err } From 37b874fb1eb33e0937947dc861ad8b6262dfec31 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 09:46:01 +0800 Subject: [PATCH 12/57] dd --- business/auth2/auth2.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 066ef3ed2..a3cdda650 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -160,6 +160,7 @@ func getFixedTokenName(token string) *AuthInfo { func createAuthInfo(user IUser, authBindInfo *AuthBindEx) (authInfo *AuthInfo) { token, tokenType := createToken(user, authBindInfo) + //user为空 tokenType=2 globals.SugarLogger.Debug("token，tokenType============", token, tokenType) expireDuration := DefTokenDuration authInfo = &AuthInfo{ @@ -365,9 +366,11 @@ func DecryptUserMsg(sessionKey, iv, msg string) (string, error) { // 通过临时TOKEN绑定新创建的用户 func BindUser(inauthInfo *AuthInfo, user IUser) (outauthInfo *AuthInfo, err error) { if err = AddAuthBind(user, inauthInfo); err == nil { + globals.SugarLogger.Debug("进入AddAuthBind=============输出一下user.GetID()", user.GetID()) inauthInfo.AuthBindInfo.UserID = user.GetID() outauthInfo = createAuthInfo(user, inauthInfo.AuthBindInfo) } + globals.SugarLogger.Debug("=============输出一下outauthInfo", outauthInfo) return outauthInfo, err } From addcd9eb7297dac4f75a6315fd7df5f5f21e89a6 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 09:54:38 +0800 Subject: [PATCH 13/57] dd --- business/auth2/auth2.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index a3cdda650..ba02a9ff9 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -290,6 +290,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string authInfo = createAuthInfo(user, authBindEx) globals.SugarLogger.Debug("输出authInfo", authInfo) if user != nil && user.GetID() != "" { + globals.SugarLogger.Debug("我进入到user != nil && user.GetID()") userProvider.UpdateLastLogin(user.GetID(), authType, ctx.GetRealRemoteIP()) } //如果是小程序 @@ -391,6 +392,7 @@ func AddAuthBind(user IUser, newAuthInfo *AuthInfo) (err error) { } else { if handler := authers[newAuthInfo.AuthBindInfo.Type]; handler != nil { newAuthInfo.AuthBindInfo.UserID = user.GetID() + globals.SugarLogger.Debug("进入AddAuthBind获取userID", newAuthInfo.AuthBindInfo.UserID) handler.UnbindAuth(user.GetID(), newAuthInfo.GetAuthType(), newAuthInfo.GetAuthTypeID(), user.GetName()) err = handler.AddAuthBind(newAuthInfo.AuthBindInfo, user.GetName()) } else { From 4f8e99e93936269911404b1a997c63c786a77c86 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 10:01:11 +0800 Subject: [PATCH 14/57] dd --- business/auth2/auth2.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index ba02a9ff9..0a538dc99 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -318,6 +318,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string } else { err = ErrIllegalAuthType } + globals.SugarLogger.Debug("我到最末端了===========================") return authInfo, err } From ff4e84e2e0aef75c31c75ba9f878046cb9c8bc33 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 10:15:46 +0800 Subject: [PATCH 15/57] dd --- business/auth2/auth2.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 0a538dc99..694f8e521 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -323,6 +323,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string } func Login(ctx *Context, authType, authID, authIDType, authSecret string) (authInfo *AuthInfo, err error) { + globals.SugarLogger.Debug("我进入login了===========================") if authSecret == InternalAuthSecret { authSecret = "" } From 4567d8dff6def7ad2b37e1ff07dc06bfb36c6b54 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 10:26:21 +0800 Subject: [PATCH 16/57] dd --- business/auth2/auth2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 694f8e521..783d1514a 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -161,7 +161,7 @@ func getFixedTokenName(token string) *AuthInfo { func createAuthInfo(user IUser, authBindInfo *AuthBindEx) (authInfo *AuthInfo) { token, tokenType := createToken(user, authBindInfo) //user为空 tokenType=2 - globals.SugarLogger.Debug("token，tokenType============", token, tokenType) + globals.SugarLogger.Debug("token，tokenType,user============", token, tokenType, user) expireDuration := DefTokenDuration authInfo = &AuthInfo{ AuthBindInfo: authBindInfo, From 0819ed3b2b2877fc3ded173c379d74b43339c043 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 10:35:22 +0800 Subject: [PATCH 17/57] dd --- business/auth2/auth2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 783d1514a..e7b9d0a9f 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -276,7 +276,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string // authBindEx.UserID = user.GetID() // } //if user3:=api.DingDingAPI.GetUserID(a) - if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { + if user2 := userProvider.GetUser(authBindEx.AuthID2, authIDType); user2 != nil { user = user2 } globals.SugarLogger.Debug("user检测1=============", user) From 2ad054b7de8ed669d7ad51ec67e586dd2064863c Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 10:48:04 +0800 Subject: [PATCH 18/57] dd --- business/auth2/auth2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index e7b9d0a9f..e3de92b2f 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -276,7 +276,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string // authBindEx.UserID = user.GetID() // } //if user3:=api.DingDingAPI.GetUserID(a) - if user2 := userProvider.GetUser(authBindEx.AuthID2, authIDType); user2 != nil { + if user2 := userProvider.GetUser(authBindEx.AuthID2, "auth_id2"); user2 != nil { user = user2 } globals.SugarLogger.Debug("user检测1=============", user) From e0ed6f16655df0b83cf8414d21577bb4cac62d9a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 10:51:57 +0800 Subject: [PATCH 19/57] dd --- business/auth2/auth2.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index e3de92b2f..7bc3bc97c 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -475,7 +475,8 @@ func ClearUserToken(userID string) { func createToken(user IUser, authBindInfo *AuthBindEx) (token string, tokenType int) { userID := TokenUserEmpty userName := authBindInfo.AuthID - tokenType = TokenTypeOnlyAuth + tokenType = TokenTypeNormal + //tokenType = TokenTypeOnlyAuth if user != nil { userID = user.GetID() userName = "[" + user.GetID2() + "]" From af8e5d6b6161afefc16e17ca01a47f98889effdc Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 10:54:58 +0800 Subject: [PATCH 20/57] dd --- business/auth2/auth2.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 7bc3bc97c..e3de92b2f 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -475,8 +475,7 @@ func ClearUserToken(userID string) { func createToken(user IUser, authBindInfo *AuthBindEx) (token string, tokenType int) { userID := TokenUserEmpty userName := authBindInfo.AuthID - tokenType = TokenTypeNormal - //tokenType = TokenTypeOnlyAuth + tokenType = TokenTypeOnlyAuth if user != nil { userID = user.GetID() userName = "[" + user.GetID2() + "]" From 2cc50637a86074a3bf8905cf2e59320d8d00abf3 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 11:00:15 +0800 Subject: [PATCH 21/57] dd --- business/auth2/auth2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index e3de92b2f..69fb25aea 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -264,7 +264,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string } else { // 返回authBind中UserID为空表示只是认证，但本地没有记录，这种情况会返回临时TOKEN if authBindEx.UserHint != nil && authBindEx.UserID == "" { - globals.SugarLogger.Debug("进入") + globals.SugarLogger.Debug("进入,输出一下authBindEx,authBindEx.UserHint", authBindEx, authBindEx.UserHint) // 利用得到受信任的信息查找用户 // if authBindEx.UserHint.Mobile != "" { // user = userProvider.GetUser(authBindEx.UserHint.Mobile, UserIDMobile) From d378b5e4695be42577ce6f52ccb2042ad4a1e229 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 11:15:45 +0800 Subject: [PATCH 22/57] dd --- business/auth2/auth2.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 69fb25aea..b75c0b3f8 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -178,7 +178,7 @@ func createAuthInfo(user IUser, authBindInfo *AuthBindEx) (authInfo *AuthInfo) { authInfo.ExpiresAt = time.Now().Add(expireDuration).Unix() globals.SugarLogger.Debugf("createAuthInfo authInfo:%s", utils.Format4Output(authInfo, true)) } - SetUserInfo(token, authInfo, expireDuration) + //SetUserInfo(token, authInfo, expireDuration) return authInfo } @@ -264,7 +264,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string } else { // 返回authBind中UserID为空表示只是认证，但本地没有记录，这种情况会返回临时TOKEN if authBindEx.UserHint != nil && authBindEx.UserID == "" { - globals.SugarLogger.Debug("进入,输出一下authBindEx,authBindEx.UserHint", authBindEx, authBindEx.UserHint) + globals.SugarLogger.Debug("进入") // 利用得到受信任的信息查找用户 // if authBindEx.UserHint.Mobile != "" { // user = userProvider.GetUser(authBindEx.UserHint.Mobile, UserIDMobile) @@ -279,6 +279,9 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string if user2 := userProvider.GetUser(authBindEx.AuthID2, "auth_id2"); user2 != nil { user = user2 } + //if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { + // user = user2 + //} globals.SugarLogger.Debug("user检测1=============", user) } else if authBindEx.UserID != "" { user = userProvider.GetUser(authBindEx.UserID, UserIDID) From 00ad5700413bf35c05f729c8303a7a9f6df438a2 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 11:51:10 +0800 Subject: [PATCH 23/57] dd --- business/auth2/auth2.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index b75c0b3f8..e449a43ca 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -178,7 +178,7 @@ func createAuthInfo(user IUser, authBindInfo *AuthBindEx) (authInfo *AuthInfo) { authInfo.ExpiresAt = time.Now().Add(expireDuration).Unix() globals.SugarLogger.Debugf("createAuthInfo authInfo:%s", utils.Format4Output(authInfo, true)) } - //SetUserInfo(token, authInfo, expireDuration) + SetUserInfo(token, authInfo, expireDuration) return authInfo } @@ -275,13 +275,9 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string // if user != nil { // authBindEx.UserID = user.GetID() // } - //if user3:=api.DingDingAPI.GetUserID(a) - if user2 := userProvider.GetUser(authBindEx.AuthID2, "auth_id2"); user2 != nil { + if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { user = user2 } - //if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { - // user = user2 - //} globals.SugarLogger.Debug("user检测1=============", user) } else if authBindEx.UserID != "" { user = userProvider.GetUser(authBindEx.UserID, UserIDID) From be1311f206adc029da103de5f4371a617ddab359 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 14:14:57 +0800 Subject: [PATCH 24/57] dd --- business/auth2/authprovider/dingding/qrcode.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/business/auth2/authprovider/dingding/qrcode.go b/business/auth2/authprovider/dingding/qrcode.go index 81392e429..b43a55a7a 100644 --- a/business/auth2/authprovider/dingding/qrcode.go +++ b/business/auth2/authprovider/dingding/qrcode.go @@ -26,11 +26,22 @@ func (a *QRCodeAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthB userQRInfo, err := api.DingDingQRCodeAPI.GetUserInfoByCode(code) if err == nil { + tmp_userID, err := api.DingDingAPI.GetByUnionID(userQRInfo.UnionID) + if err != nil { + return nil, err + } + userInfo, err := api.DingDingAPI.GetUser(tmp_userID.UserID) + if err != nil { + return nil, err + } globals.SugarLogger.Debugf("dingding qrcode VerifySecret code:%s, userQRInfo:%s", code, utils.Format4Output(userQRInfo, false)) if authBindEx, err = a.UnionFindAuthBind(AuthTypeQRCode, api.DingDingQRCodeAPI.GetAppID(), []string{AuthTypeStaff, AuthTypeQRCode}, userQRInfo.OpenID, userQRInfo.UnionID, userQRInfo); err == nil { authBindEx.UserHint = &auth2.UserBasic{ - Name: userQRInfo.Nickname, - //UserID: userQR Info., + //Name: userQRInfo.Nickname, + UserID2: tmp_userID.UserID, + Mobile: utils.Interface2String(userInfo["mobile"]), + Email: utils.Interface2String(userInfo["email"]), + Name: utils.Interface2String(userInfo["name"]), } } } From 70380d27d5401737b8bddcefe18b043565048d75 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 14:24:45 +0800 Subject: [PATCH 25/57] dd --- controllers/auth2.go | 1 + 1 file changed, 1 insertion(+) diff --git a/controllers/auth2.go b/controllers/auth2.go index e0593cf24..27ac53507 100644 --- a/controllers/auth2.go +++ b/controllers/auth2.go @@ -269,6 +269,7 @@ func (c *Auth2Controller) DingDingOAuth2() { } ctx := auth2.NewContext(c.Ctx.ResponseWriter, c.Ctx.Request) authInfo, err := auth2.Login(ctx, dingding.AuthTypeQRCode, params.State, "", params.Code) + globals.SugarLogger.Debug("DingDingOAuth2 输出authInfo", authInfo) if err == nil { callResult = &CallResult{ Code: model.ErrCodeSuccess, From 120c9f07208dd2f9d2e6ea4580cbbc13b0396026 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 14:31:14 +0800 Subject: [PATCH 26/57] dd --- business/auth2/authprovider/dingding/qrcode.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/auth2/authprovider/dingding/qrcode.go b/business/auth2/authprovider/dingding/qrcode.go index b43a55a7a..274815570 100644 --- a/business/auth2/authprovider/dingding/qrcode.go +++ b/business/auth2/authprovider/dingding/qrcode.go @@ -34,6 +34,7 @@ func (a *QRCodeAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthB if err != nil { return nil, err } + globals.SugarLogger.Debug("tmp_userID====,userInfo=======", tmp_userID, userInfo) globals.SugarLogger.Debugf("dingding qrcode VerifySecret code:%s, userQRInfo:%s", code, utils.Format4Output(userQRInfo, false)) if authBindEx, err = a.UnionFindAuthBind(AuthTypeQRCode, api.DingDingQRCodeAPI.GetAppID(), []string{AuthTypeStaff, AuthTypeQRCode}, userQRInfo.OpenID, userQRInfo.UnionID, userQRInfo); err == nil { authBindEx.UserHint = &auth2.UserBasic{ @@ -45,5 +46,6 @@ func (a *QRCodeAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthB } } } + globals.SugarLogger.Debug("authBindEx.UserHint===============", authBindEx.UserHint) return authBindEx, err } From 4572dcf288508cb0ad29f0f345f310491cef0224 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 15:13:26 +0800 Subject: [PATCH 27/57] dd --- .../auth2/authprovider/dingding/qrcode.go | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/business/auth2/authprovider/dingding/qrcode.go b/business/auth2/authprovider/dingding/qrcode.go index 274815570..14b4933ed 100644 --- a/business/auth2/authprovider/dingding/qrcode.go +++ b/business/auth2/authprovider/dingding/qrcode.go @@ -21,30 +21,32 @@ func init() { auth2.RegisterAuther(AuthTypeQRCode, AutherObjQRCode) } -func (a *QRCodeAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthBindEx, err error) { +func (a *QRCodeAuther) VerifySecret(dummy, code string) (*auth2.AuthBindEx, error) { globals.SugarLogger.Debugf("dingding qrcode VerifySecret code:%s", code) - userQRInfo, err := api.DingDingQRCodeAPI.GetUserInfoByCode(code) - if err == nil { - tmp_userID, err := api.DingDingAPI.GetByUnionID(userQRInfo.UnionID) - if err != nil { - return nil, err - } - userInfo, err := api.DingDingAPI.GetUser(tmp_userID.UserID) - if err != nil { - return nil, err - } - globals.SugarLogger.Debug("tmp_userID====,userInfo=======", tmp_userID, userInfo) - globals.SugarLogger.Debugf("dingding qrcode VerifySecret code:%s, userQRInfo:%s", code, utils.Format4Output(userQRInfo, false)) - if authBindEx, err = a.UnionFindAuthBind(AuthTypeQRCode, api.DingDingQRCodeAPI.GetAppID(), []string{AuthTypeStaff, AuthTypeQRCode}, userQRInfo.OpenID, userQRInfo.UnionID, userQRInfo); err == nil { - authBindEx.UserHint = &auth2.UserBasic{ - //Name: userQRInfo.Nickname, - UserID2: tmp_userID.UserID, - Mobile: utils.Interface2String(userInfo["mobile"]), - Email: utils.Interface2String(userInfo["email"]), - Name: utils.Interface2String(userInfo["name"]), - } - } + if err != nil { + return nil, err + } + tmp_userID, err := api.DingDingAPI.GetByUnionID(userQRInfo.UnionID) + if err != nil { + return nil, err + } + userInfo, err := api.DingDingAPI.GetUser(tmp_userID.UserID) + if err != nil { + return nil, err + } + globals.SugarLogger.Debug("tmp_userID====,userInfo=======", tmp_userID, userInfo) + globals.SugarLogger.Debugf("dingding qrcode VerifySecret code:%s, userQRInfo:%s", code, utils.Format4Output(userQRInfo, false)) + authBindEx, err := a.UnionFindAuthBind(AuthTypeQRCode, api.DingDingQRCodeAPI.GetAppID(), []string{AuthTypeStaff, AuthTypeQRCode}, userQRInfo.OpenID, userQRInfo.UnionID, userQRInfo) + if err != nil { + return nil, err + } + authBindEx.UserHint = &auth2.UserBasic{ + //Name: userQRInfo.Nickname, + UserID2: tmp_userID.UserID, + Mobile: utils.Interface2String(userInfo["mobile"]), + Email: utils.Interface2String(userInfo["email"]), + Name: utils.Interface2String(userInfo["name"]), } globals.SugarLogger.Debug("authBindEx.UserHint===============", authBindEx.UserHint) return authBindEx, err From ce1a9f3816f3490587f9de6c94659d9104de081d Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 15:18:52 +0800 Subject: [PATCH 28/57] dd --- business/auth2/auth2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index e449a43ca..bb7f9cdb6 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -275,7 +275,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string // if user != nil { // authBindEx.UserID = user.GetID() // } - if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { + if user2 := userProvider.GetUser(authBindEx.UserHint.Mobile, UserIDMobile); user2 != nil { user = user2 } globals.SugarLogger.Debug("user检测1=============", user) From 69b580de8e264f72e909bee24814404f38198109 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 15:24:06 +0800 Subject: [PATCH 29/57] dd --- business/auth2/auth2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index bb7f9cdb6..e449a43ca 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -275,7 +275,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string // if user != nil { // authBindEx.UserID = user.GetID() // } - if user2 := userProvider.GetUser(authBindEx.UserHint.Mobile, UserIDMobile); user2 != nil { + if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { user = user2 } globals.SugarLogger.Debug("user检测1=============", user) From 6d1e9c36de09b34109ccc0f550053751e2b06656 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 15:34:44 +0800 Subject: [PATCH 30/57] dd --- business/auth2/auth2.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index e449a43ca..7b31bd547 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -266,15 +266,15 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string if authBindEx.UserHint != nil && authBindEx.UserID == "" { globals.SugarLogger.Debug("进入") // 利用得到受信任的信息查找用户 - // if authBindEx.UserHint.Mobile != "" { - // user = userProvider.GetUser(authBindEx.UserHint.Mobile, UserIDMobile) - // } - // if user == nil && authBindEx.UserHint.Email != "" { - // user = userProvider.GetUser(authBindEx.UserHint.Email, UserIDEmail) - // } - // if user != nil { - // authBindEx.UserID = user.GetID() - // } + if authBindEx.UserHint.Mobile != "" { + user = userProvider.GetUser(authBindEx.UserHint.Mobile, UserIDMobile) + } + if user == nil && authBindEx.UserHint.Email != "" { + user = userProvider.GetUser(authBindEx.UserHint.Email, UserIDEmail) + } + if user != nil { + authBindEx.UserID = user.GetID() + } if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { user = user2 } From b558f518c1384602baa05689e798860aeedb61cf Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 17:18:39 +0800 Subject: [PATCH 31/57] add authBind --- business/auth2/auth2.go | 12 ------------ business/auth2/authprovider/dingding/qrcode.go | 3 --- controllers/auth2.go | 4 ++++ 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 7b31bd547..48876223c 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -253,7 +253,6 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string globals.SugarLogger.Debugf("Login authBindEx", utils.Format4Output(authBindEx, false)) if authBindEx == nil { // mobile, email会返回nil（表示不会新建AuthBind实体） user = userProvider.GetUser(authID, authIDType) - globals.SugarLogger.Debug("user第一次===================", user) authBindEx = &AuthBindEx{ AuthBind: model.AuthBind{ Type: authType, @@ -264,7 +263,6 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string } else { // 返回authBind中UserID为空表示只是认证，但本地没有记录，这种情况会返回临时TOKEN if authBindEx.UserHint != nil && authBindEx.UserID == "" { - globals.SugarLogger.Debug("进入") // 利用得到受信任的信息查找用户 if authBindEx.UserHint.Mobile != "" { user = userProvider.GetUser(authBindEx.UserHint.Mobile, UserIDMobile) @@ -278,18 +276,12 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string if user2 := userProvider.GetUser(authBindEx.UserHint.Email, UserIDMobile); user2 != nil { user = user2 } - globals.SugarLogger.Debug("user检测1=============", user) } else if authBindEx.UserID != "" { user = userProvider.GetUser(authBindEx.UserID, UserIDID) - globals.SugarLogger.Debug("user检测2=============", user) } - globals.SugarLogger.Debug("user第二次=============", user) } - globals.SugarLogger.Debug("输出authBindEx,user", authBindEx, user) authInfo = createAuthInfo(user, authBindEx) - globals.SugarLogger.Debug("输出authInfo", authInfo) if user != nil && user.GetID() != "" { - globals.SugarLogger.Debug("我进入到user != nil && user.GetID()") userProvider.UpdateLastLogin(user.GetID(), authType, ctx.GetRealRemoteIP()) } //如果是小程序 @@ -317,12 +309,10 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string } else { err = ErrIllegalAuthType } - globals.SugarLogger.Debug("我到最末端了===========================") return authInfo, err } func Login(ctx *Context, authType, authID, authIDType, authSecret string) (authInfo *AuthInfo, err error) { - globals.SugarLogger.Debug("我进入login了===========================") if authSecret == InternalAuthSecret { authSecret = "" } @@ -368,11 +358,9 @@ func DecryptUserMsg(sessionKey, iv, msg string) (string, error) { // 通过临时TOKEN绑定新创建的用户 func BindUser(inauthInfo *AuthInfo, user IUser) (outauthInfo *AuthInfo, err error) { if err = AddAuthBind(user, inauthInfo); err == nil { - globals.SugarLogger.Debug("进入AddAuthBind=============输出一下user.GetID()", user.GetID()) inauthInfo.AuthBindInfo.UserID = user.GetID() outauthInfo = createAuthInfo(user, inauthInfo.AuthBindInfo) } - globals.SugarLogger.Debug("=============输出一下outauthInfo", outauthInfo) return outauthInfo, err } diff --git a/business/auth2/authprovider/dingding/qrcode.go b/business/auth2/authprovider/dingding/qrcode.go index 14b4933ed..2e3caead7 100644 --- a/business/auth2/authprovider/dingding/qrcode.go +++ b/business/auth2/authprovider/dingding/qrcode.go @@ -35,19 +35,16 @@ func (a *QRCodeAuther) VerifySecret(dummy, code string) (*auth2.AuthBindEx, erro if err != nil { return nil, err } - globals.SugarLogger.Debug("tmp_userID====,userInfo=======", tmp_userID, userInfo) globals.SugarLogger.Debugf("dingding qrcode VerifySecret code:%s, userQRInfo:%s", code, utils.Format4Output(userQRInfo, false)) authBindEx, err := a.UnionFindAuthBind(AuthTypeQRCode, api.DingDingQRCodeAPI.GetAppID(), []string{AuthTypeStaff, AuthTypeQRCode}, userQRInfo.OpenID, userQRInfo.UnionID, userQRInfo) if err != nil { return nil, err } authBindEx.UserHint = &auth2.UserBasic{ - //Name: userQRInfo.Nickname, UserID2: tmp_userID.UserID, Mobile: utils.Interface2String(userInfo["mobile"]), Email: utils.Interface2String(userInfo["email"]), Name: utils.Interface2String(userInfo["name"]), } - globals.SugarLogger.Debug("authBindEx.UserHint===============", authBindEx.UserHint) return authBindEx, err } diff --git a/controllers/auth2.go b/controllers/auth2.go index 27ac53507..db3350d52 100644 --- a/controllers/auth2.go +++ b/controllers/auth2.go @@ -275,6 +275,10 @@ func (c *Auth2Controller) DingDingOAuth2() { Code: model.ErrCodeSuccess, Data: string(utils.MustMarshal(authInfo)), } + //增加钉钉扫码 auth_bind 绑定 + if err := auth2.AddAuthBind(&authInfo.UserBasic, authInfo); err != nil { + return nil, "", err + } } else { callResult = &CallResult{ Code: model.ErrCodeGeneralFailed, From 8ee87e75d9085e498c5aadaa533cb53b6f178a94 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 12 Aug 2022 17:29:08 +0800 Subject: [PATCH 32/57] rolleback --- controllers/auth2.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/controllers/auth2.go b/controllers/auth2.go index db3350d52..27ac53507 100644 --- a/controllers/auth2.go +++ b/controllers/auth2.go @@ -275,10 +275,6 @@ func (c *Auth2Controller) DingDingOAuth2() { Code: model.ErrCodeSuccess, Data: string(utils.MustMarshal(authInfo)), } - //增加钉钉扫码 auth_bind 绑定 - if err := auth2.AddAuthBind(&authInfo.UserBasic, authInfo); err != nil { - return nil, "", err - } } else { callResult = &CallResult{ Code: model.ErrCodeGeneralFailed, From c32bccd74152d28e999cdd420c5a7a86bd21392a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 15 Aug 2022 16:37:39 +0800 Subject: [PATCH 33/57] 1 --- business/partner/purchase/ebai/order.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 6750b6dc9..3d3b3aa07 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -638,9 +638,9 @@ func (c *PurchaseHandler) GetOrderRealMobile(ctx *jxcontext.Context, order *mode return mobile, err } -func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) { +func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model.GoodsOrder, isAcceptIt bool, reason string) (err error) { if globals.EnableEbaiStoreWrite { - if isAgree { + if isAcceptIt { err = api.EbaiAPI.OrderAgreeRefund(order.VendorOrderID) } else { err = api.EbaiAPI.OrderDisagreeRefund(order.VendorOrderID, reason) From 64fc4bfe1d563839ad7a4237860145b9b2addb77 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 16 Aug 2022 13:57:11 +0800 Subject: [PATCH 34/57] =?UTF-8?q?dy=20=E8=8E=B7=E5=8F=96=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E5=BA=97=E9=93=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/cms_store.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 8fc03accd..38cc413e8 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -12,6 +12,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" + "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" ) @@ -589,12 +590,13 @@ func (c *StoreController) GetStoreListByLocation() { if err != nil { return nil, "", err } - + globals.SugarLogger.Debug("检测数据userAuth,user,total==============", userAuth, user, total) // 获取位置附近门店列表 storeIDs := make([]int, 0, len(locationList)) for _, v := range locationList { storeIDs = append(storeIDs, v.ID) } + globals.SugarLogger.Debug("检测数据locationList,storeIDs==============", locationList, storeIDs) // 判断门店是不是b2b门店，如果是，用户必须为系统管理员（门店老板和运营人员） store, err := dao.GetStoreList(dao.GetDB(), storeIDs, nil, nil, nil, nil, "") if err != nil { @@ -630,6 +632,7 @@ func (c *StoreController) GetStoreListByLocation() { return result, "", err } } + globals.SugarLogger.Debug("检测最后的数据locationList==============", locationList) return locationList, "", err }) } From 118b3ce01145c16d1b2e5ee4a8c00c2736f0dd72 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 16 Aug 2022 15:33:22 +0800 Subject: [PATCH 35/57] tempToken --- controllers/cms_store.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 38cc413e8..1dc855b19 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -579,7 +579,9 @@ func (c *StoreController) SyncStoresCourierInfo() { func (c *StoreController) GetStoreListByLocation() { c.callGetStoreListByLocation(func(params *tStoreGetStoreListByLocationParams) (retVal interface{}, errCode string, err error) { locationList, err := common.GetStoreListByLocation(params.Ctx, params.Lng, params.Lat, 20000, params.NeedWalkDistance, false, params.BrandID) - + if params.Token == "tempToken" { + return locationList, "", nil + } if params.Token != "" { // 获取用户权限，如果是普通用户不展示b2b相关目录，如果是门店老板或者管理则展示全部 userAuth, err := auth2.GetTokenInfo(params.Token) From 81b83c3f9b60a82ec990a8447afa86e15b8ded5e Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 16 Aug 2022 15:35:39 +0800 Subject: [PATCH 36/57] tempToken --- controllers/cms_store.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 1dc855b19..e09e16ae8 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -579,9 +579,9 @@ func (c *StoreController) SyncStoresCourierInfo() { func (c *StoreController) GetStoreListByLocation() { c.callGetStoreListByLocation(func(params *tStoreGetStoreListByLocationParams) (retVal interface{}, errCode string, err error) { locationList, err := common.GetStoreListByLocation(params.Ctx, params.Lng, params.Lat, 20000, params.NeedWalkDistance, false, params.BrandID) - if params.Token == "tempToken" { - return locationList, "", nil - } + //if params.Token == "tempToken" { + // return locationList, "", nil + //} if params.Token != "" { // 获取用户权限，如果是普通用户不展示b2b相关目录，如果是门店老板或者管理则展示全部 userAuth, err := auth2.GetTokenInfo(params.Token) From 9ed495e8364e74d5142ed4d192c2fd12d8069b53 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 17 Aug 2022 11:09:41 +0800 Subject: [PATCH 37/57] 1 --- controllers/cms_store.go | 1 - 1 file changed, 1 deletion(-) diff --git a/controllers/cms_store.go b/controllers/cms_store.go index e09e16ae8..dda4317b9 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -634,7 +634,6 @@ func (c *StoreController) GetStoreListByLocation() { return result, "", err } } - globals.SugarLogger.Debug("检测最后的数据locationList==============", locationList) return locationList, "", err }) } From 6fdfb536ab06c543994a9fead9c3522fb593019b Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 17 Aug 2022 16:31:37 +0800 Subject: [PATCH 38/57] =?UTF-8?q?tiktok=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/auth2/auth2.go | 1 + conf/app.conf | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 48876223c..bfa3970e0 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -249,6 +249,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string } realAuthID = user.GetID() } + globals.SugarLogger.Debug("打印realAuthID检测是否为空==================", realAuthID) if authBindEx, err = handler.VerifySecret(realAuthID, authSecret); err == nil { globals.SugarLogger.Debugf("Login authBindEx", utils.Format4Output(authBindEx, false)) if authBindEx == nil { // mobile, email会返回nil（表示不会新建AuthBind实体） diff --git a/conf/app.conf b/conf/app.conf index e30653893..cb86de876 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -209,6 +209,9 @@ getYLYTokenURL = "http://www.jxc4.com/v2/sys/GetYLYToken" tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" + +tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 +tiktokJXDJSecret="9285b20dce3c46179204a5aa4d92ca96ee1ed5c9" #国美 gomeiAppKey = "N0R033L2QQFR53" gomeiAppSecret = "686ffc3e31c24594838baed045563790" @@ -331,6 +334,9 @@ jxPrintAppKey = "rfBd56ti2SMtYvSg" tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" + +tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 +tiktokJXDJSecret="9285b20dce3c46179204a5aa4d92ca96ee1ed5c9" #国美 gomeiAppKey = "N0R033L2QQFR53" gomeiAppSecret = "686ffc3e31c24594838baed045563790" @@ -433,6 +439,9 @@ jxPrintAppKey = "rfBd56ti2SMtYvSg" storeName = "京西果园" tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" + +tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 +tiktokJXDJSecret="9285b20dce3c46179204a5aa4d92ca96ee1ed5c9" #国美 gomeiAppKey = "N0R033L2QQFR53" gomeiAppSecret = "686ffc3e31c24594838baed045563790" @@ -618,6 +627,9 @@ jxPrintAppKey = "rfBd56ti2SMtYvSg" tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" + +tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 +tiktokJXDJSecret="9285b20dce3c46179204a5aa4d92ca96ee1ed5c9" #国美 gomeiAppKey = "N0R033L2QQFR53" gomeiAppSecret = "686ffc3e31c24594838baed045563790" \ No newline at end of file From 8a54dde637efbd53ddad16d181ba6ea2f2f560c9 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 10:40:57 +0800 Subject: [PATCH 39/57] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=96=B0=E6=8A=96?= =?UTF-8?q?=E9=9F=B3=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/auth2/auth2.go | 1 + .../auth2/authprovider/douyin/tiktop_mini.go | 16 ++++++++++++---- conf/app.conf | 12 ++++++++---- globals/api/api.go | 7 +++++-- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index bfa3970e0..f838bfffc 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -306,6 +306,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string } } } + } } else { err = ErrIllegalAuthType diff --git a/business/auth2/authprovider/douyin/tiktop_mini.go b/business/auth2/authprovider/douyin/tiktop_mini.go index 7b4b7a5ca..24600b2c3 100644 --- a/business/auth2/authprovider/douyin/tiktop_mini.go +++ b/business/auth2/authprovider/douyin/tiktop_mini.go @@ -1,11 +1,11 @@ package douyin import ( - "git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin" - + "git.rosy.net.cn/baseapi/platformapi/tiktok" "git.rosy.net.cn/baseapi/platformapi/weixinapi" "git.rosy.net.cn/jx-callback/business/auth2" "git.rosy.net.cn/jx-callback/business/auth2/authprovider" + "git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" @@ -30,8 +30,8 @@ func init() { func (a *TiktopMiniAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthBindEx, err error) { globals.SugarLogger.Debugf("toktok mini VerifySecret jsCode:%s", code) - - sessionInfo, err := api.TiktokApi.GetTiktokOauth(code) + appID, _ := weixin.SplitJsCode(code) + sessionInfo, err := getTikTokApp(appID).GetTiktokOauth(code) globals.SugarLogger.Debug("toktok mini VerifySecret sessionInfo:", sessionInfo) if err == nil { sessionKey := sessionInfo.Data.SessionKey @@ -88,3 +88,11 @@ func getWxApp(appID string) (miniApi *weixinapi.API) { } return miniApi } + +func getTikTokApp(appID string) (TikTokMini *tiktok.API) { + TikTokMini = api.TiktokApi + if len(appID) > 0 && appID == api.TiktokJXDJApiID { + TikTokMini = api.TiktokJXDJApi + } + return TikTokMini +} diff --git a/conf/app.conf b/conf/app.conf index cb86de876..a5c49e6a3 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -211,7 +211,8 @@ tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 -tiktokJXDJSecret="9285b20dce3c46179204a5aa4d92ca96ee1ed5c9" +TiktokJXDJApiID="ttaceeda5333d7a7ab01" +tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4" #国美 gomeiAppKey = "N0R033L2QQFR53" gomeiAppSecret = "686ffc3e31c24594838baed045563790" @@ -336,7 +337,8 @@ tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 -tiktokJXDJSecret="9285b20dce3c46179204a5aa4d92ca96ee1ed5c9" +TiktokJXDJApiID="ttaceeda5333d7a7ab01" +tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4" #国美 gomeiAppKey = "N0R033L2QQFR53" gomeiAppSecret = "686ffc3e31c24594838baed045563790" @@ -441,7 +443,8 @@ tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 -tiktokJXDJSecret="9285b20dce3c46179204a5aa4d92ca96ee1ed5c9" +TiktokJXDJApiID="ttaceeda5333d7a7ab01" +tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4" #国美 gomeiAppKey = "N0R033L2QQFR53" gomeiAppSecret = "686ffc3e31c24594838baed045563790" @@ -629,7 +632,8 @@ tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 -tiktokJXDJSecret="9285b20dce3c46179204a5aa4d92ca96ee1ed5c9" +TiktokJXDJApiID="ttaceeda5333d7a7ab01" +tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4" #国美 gomeiAppKey = "N0R033L2QQFR53" gomeiAppSecret = "686ffc3e31c24594838baed045563790" \ No newline at end of file diff --git a/globals/api/api.go b/globals/api/api.go index dcb70038f..3a2068c64 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -112,8 +112,11 @@ var ( Cacher cache.ICacher SMSClient *aliyunsmsclient.SmsClient - TiktokApi *tiktok.API // 抖音api - GuoMeiApi *gomei.API // 国美api + TiktokApi *tiktok.API // 抖音api + TiktokJXDJApi *tiktok.API //抖音京西到家api + TiktokApiID string //抖音商城ID + TiktokJXDJApiID string //抖音京西到家ID + GuoMeiApi *gomei.API // 国美api EnterpriseChatHeadApi *enterprise.API // 企业微信api EnterpriseChatMin *enterprise.API // 企业微信小程序api From 3de59cf400f792e4429344fb81d9cae0b40e6f08 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 11:19:41 +0800 Subject: [PATCH 40/57] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=96=B0=E6=8A=96?= =?UTF-8?q?=E9=9F=B3=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/auth2/authprovider/douyin/tiktop_mini.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/auth2/authprovider/douyin/tiktop_mini.go b/business/auth2/authprovider/douyin/tiktop_mini.go index 24600b2c3..e94ae36d9 100644 --- a/business/auth2/authprovider/douyin/tiktop_mini.go +++ b/business/auth2/authprovider/douyin/tiktop_mini.go @@ -30,7 +30,8 @@ func init() { func (a *TiktopMiniAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthBindEx, err error) { globals.SugarLogger.Debugf("toktok mini VerifySecret jsCode:%s", code) - appID, _ := weixin.SplitJsCode(code) + appID, code := weixin.SplitJsCode(code) + globals.SugarLogger.Debug("检测数据生成结果============", appID) sessionInfo, err := getTikTokApp(appID).GetTiktokOauth(code) globals.SugarLogger.Debug("toktok mini VerifySecret sessionInfo:", sessionInfo) if err == nil { From cf04c63261d4e1bf8aa4f769b5c3887058b51d25 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 11:44:57 +0800 Subject: [PATCH 41/57] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=96=B0=E6=8A=96?= =?UTF-8?q?=E9=9F=B3=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth2/authprovider/douyin/tiktop_mini.go | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/business/auth2/authprovider/douyin/tiktop_mini.go b/business/auth2/authprovider/douyin/tiktop_mini.go index e94ae36d9..c7c52e218 100644 --- a/business/auth2/authprovider/douyin/tiktop_mini.go +++ b/business/auth2/authprovider/douyin/tiktop_mini.go @@ -9,6 +9,7 @@ import ( "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" + "strings" ) const ( @@ -30,15 +31,16 @@ func init() { func (a *TiktopMiniAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthBindEx, err error) { globals.SugarLogger.Debugf("toktok mini VerifySecret jsCode:%s", code) - appID, code := weixin.SplitJsCode(code) + appID, code := splitCode(code) globals.SugarLogger.Debug("检测数据生成结果============", appID) sessionInfo, err := getTikTokApp(appID).GetTiktokOauth(code) + if err != nil { + return nil, err + } globals.SugarLogger.Debug("toktok mini VerifySecret sessionInfo:", sessionInfo) - if err == nil { - sessionKey := sessionInfo.Data.SessionKey - if authBindEx, err = a.UnionFindAuthBind(AuthTypeTiktokMini, api.TiktokApi.GetAppID(), []string{AuthTypeTiktokMini}, sessionInfo.Data.OpenId, sessionInfo.Data.Unionid, sessionInfo); err == nil { - authBindEx.UserData = sessionKey - } + sessionKey := sessionInfo.Data.SessionKey + if authBindEx, err = a.UnionFindAuthBind(AuthTypeTiktokMini, api.TiktokApi.GetAppID(), []string{AuthTypeTiktokMini}, sessionInfo.Data.OpenId, sessionInfo.Data.Unionid, sessionInfo); err == nil { + authBindEx.UserData = sessionKey } return authBindEx, err } @@ -97,3 +99,13 @@ func getTikTokApp(appID string) (TikTokMini *tiktok.API) { } return TikTokMini } +func splitCode(code string) (appID, realCode string) { + str := strings.Split(code, "&") + if len(str) == 2 { + appID = str[1] + realCode = str[0] + } else { + globals.SugarLogger.Warnf("splitCode abnormal code:%s", code) + } + return appID, realCode +} From d810c61222d02532116deec829a77dafed05b577 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 11:50:09 +0800 Subject: [PATCH 42/57] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=96=B0=E6=8A=96?= =?UTF-8?q?=E9=9F=B3=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/auth2/authprovider/douyin/tiktop_mini.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/auth2/authprovider/douyin/tiktop_mini.go b/business/auth2/authprovider/douyin/tiktop_mini.go index c7c52e218..a708b2763 100644 --- a/business/auth2/authprovider/douyin/tiktop_mini.go +++ b/business/auth2/authprovider/douyin/tiktop_mini.go @@ -95,8 +95,10 @@ func getWxApp(appID string) (miniApi *weixinapi.API) { func getTikTokApp(appID string) (TikTokMini *tiktok.API) { TikTokMini = api.TiktokApi if len(appID) > 0 && appID == api.TiktokJXDJApiID { + globals.SugarLogger.Debug("我进入这里了") TikTokMini = api.TiktokJXDJApi } + globals.SugarLogger.Debug("输出一下TikTokMini", TikTokMini) return TikTokMini } func splitCode(code string) (appID, realCode string) { From 1308ed9174437fde69f00eb044210b888de32afd Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 13:39:14 +0800 Subject: [PATCH 43/57] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=96=B0=E6=8A=96?= =?UTF-8?q?=E9=9F=B3=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- globals/api/api.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/globals/api/api.go b/globals/api/api.go index 3a2068c64..aa40311db 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -304,6 +304,8 @@ func Init() { QywxAPI = qywxapi.New(beego.AppConfig.DefaultString("qywxID", ""), beego.AppConfig.DefaultString("qywxSecret", ""), "") TiktokApi = tiktok.New(beego.AppConfig.DefaultString("tiktokAppSecret", ""), beego.AppConfig.DefaultString("tiktokAppKey", "")) + TiktokJXDJApi = tiktok.New(beego.AppConfig.DefaultString("tiktokJXDJSecret", ""), beego.AppConfig.DefaultString("tiktokJXDJKey", "")) + // 国美aip GuoMeiApi = gomei.New(beego.AppConfig.DefaultString("gomeiAppKey", ""), beego.AppConfig.DefaultString("gomeiAppSecret", ""), "") EnterpriseChatHeadApi = enterprise.New("ww9a156bfa070e1857", "0jBdCjSmoFiOoHIXyeCK9VbGQ82fVNJZ8uMl6JNN7X4") // 通讯录 From 5fdc2bb3468119906a78feeb2a438cab3e244dbd Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 15:59:59 +0800 Subject: [PATCH 44/57] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=96=B0=E6=8A=96?= =?UTF-8?q?=E9=9F=B3=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/auth2/authprovider/douyin/tiktop_mini.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/auth2/authprovider/douyin/tiktop_mini.go b/business/auth2/authprovider/douyin/tiktop_mini.go index a708b2763..17fc941f0 100644 --- a/business/auth2/authprovider/douyin/tiktop_mini.go +++ b/business/auth2/authprovider/douyin/tiktop_mini.go @@ -31,9 +31,9 @@ func init() { func (a *TiktopMiniAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthBindEx, err error) { globals.SugarLogger.Debugf("toktok mini VerifySecret jsCode:%s", code) - appID, code := splitCode(code) + appID, realCode := splitCode(code) globals.SugarLogger.Debug("检测数据生成结果============", appID) - sessionInfo, err := getTikTokApp(appID).GetTiktokOauth(code) + sessionInfo, err := getTikTokApp(appID).GetTiktokOauth(realCode) if err != nil { return nil, err } From 1d5deb1bdfeeead49c3d53b4df131cf09fe91cdd Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 16:07:03 +0800 Subject: [PATCH 45/57] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=96=B0=E6=8A=96?= =?UTF-8?q?=E9=9F=B3=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/auth2/authprovider/douyin/tiktop_mini.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/auth2/authprovider/douyin/tiktop_mini.go b/business/auth2/authprovider/douyin/tiktop_mini.go index 17fc941f0..600effaba 100644 --- a/business/auth2/authprovider/douyin/tiktop_mini.go +++ b/business/auth2/authprovider/douyin/tiktop_mini.go @@ -109,5 +109,6 @@ func splitCode(code string) (appID, realCode string) { } else { globals.SugarLogger.Warnf("splitCode abnormal code:%s", code) } + globals.SugarLogger.Debug("dayin realCode", realCode) return appID, realCode } From 13826246d2d38fd9c736a75f1c5bf9a82da44541 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 16:32:08 +0800 Subject: [PATCH 46/57] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=96=B0=E6=8A=96?= =?UTF-8?q?=E9=9F=B3=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/auth2/authprovider/douyin/tiktop_mini.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/auth2/authprovider/douyin/tiktop_mini.go b/business/auth2/authprovider/douyin/tiktop_mini.go index 600effaba..41c3ec5cf 100644 --- a/business/auth2/authprovider/douyin/tiktop_mini.go +++ b/business/auth2/authprovider/douyin/tiktop_mini.go @@ -32,7 +32,8 @@ func init() { func (a *TiktopMiniAuther) VerifySecret(dummy, code string) (authBindEx *auth2.AuthBindEx, err error) { globals.SugarLogger.Debugf("toktok mini VerifySecret jsCode:%s", code) appID, realCode := splitCode(code) - globals.SugarLogger.Debug("检测数据生成结果============", appID) + globals.SugarLogger.Debug("appID============", appID) + globals.SugarLogger.Debug("realCode============", realCode) sessionInfo, err := getTikTokApp(appID).GetTiktokOauth(realCode) if err != nil { return nil, err From 00c62c08dbd44302203ec4a8263ef10837228aca Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 17:32:25 +0800 Subject: [PATCH 47/57] tt --- globals/api/api.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/globals/api/api.go b/globals/api/api.go index aa40311db..6f7294940 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -304,8 +304,10 @@ func Init() { QywxAPI = qywxapi.New(beego.AppConfig.DefaultString("qywxID", ""), beego.AppConfig.DefaultString("qywxSecret", ""), "") TiktokApi = tiktok.New(beego.AppConfig.DefaultString("tiktokAppSecret", ""), beego.AppConfig.DefaultString("tiktokAppKey", "")) - TiktokJXDJApi = tiktok.New(beego.AppConfig.DefaultString("tiktokJXDJSecret", ""), beego.AppConfig.DefaultString("tiktokJXDJKey", "")) - + //TiktokJXDJApi = tiktok.New(beego.AppConfig.DefaultString("tiktokJXDJSecret", ""), beego.AppConfig.DefaultString("tiktokJXDJKey", "")) + if TiktokJXDJApiID = beego.AppConfig.DefaultString("tiktokJXDJKey", ""); TiktokJXDJApiID != "" { + TiktokJXDJApi = tiktok.New(TiktokJXDJApiID, beego.AppConfig.DefaultString("tiktokJXDJSecret", "")) + } // 国美aip GuoMeiApi = gomei.New(beego.AppConfig.DefaultString("gomeiAppKey", ""), beego.AppConfig.DefaultString("gomeiAppSecret", ""), "") EnterpriseChatHeadApi = enterprise.New("ww9a156bfa070e1857", "0jBdCjSmoFiOoHIXyeCK9VbGQ82fVNJZ8uMl6JNN7X4") // 通讯录 From 01e519d0bedc1ee83eaa118e5fcd5c30f6531387 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 17:39:23 +0800 Subject: [PATCH 48/57] tt --- conf/app.conf | 8 ++++---- globals/api/api.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/app.conf b/conf/app.conf index a5c49e6a3..e84acb4f6 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -211,7 +211,7 @@ tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 -TiktokJXDJApiID="ttaceeda5333d7a7ab01" +tiktokJXDJApiID="ttaceeda5333d7a7ab01" tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4" #国美 gomeiAppKey = "N0R033L2QQFR53" @@ -337,7 +337,7 @@ tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 -TiktokJXDJApiID="ttaceeda5333d7a7ab01" +tiktokJXDJApiID="ttaceeda5333d7a7ab01" tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4" #国美 gomeiAppKey = "N0R033L2QQFR53" @@ -443,7 +443,7 @@ tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 -TiktokJXDJApiID="ttaceeda5333d7a7ab01" +tiktokJXDJApiID="ttaceeda5333d7a7ab01" tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4" #国美 gomeiAppKey = "N0R033L2QQFR53" @@ -632,7 +632,7 @@ tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 -TiktokJXDJApiID="ttaceeda5333d7a7ab01" +tiktokJXDJApiID="ttaceeda5333d7a7ab01" tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4" #国美 gomeiAppKey = "N0R033L2QQFR53" diff --git a/globals/api/api.go b/globals/api/api.go index 6f7294940..0d9485fcc 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -115,7 +115,7 @@ var ( TiktokApi *tiktok.API // 抖音api TiktokJXDJApi *tiktok.API //抖音京西到家api TiktokApiID string //抖音商城ID - TiktokJXDJApiID string //抖音京西到家ID + tiktokJXDJApiID string //抖音京西到家ID GuoMeiApi *gomei.API // 国美api EnterpriseChatHeadApi *enterprise.API // 企业微信api @@ -305,8 +305,8 @@ func Init() { QywxAPI = qywxapi.New(beego.AppConfig.DefaultString("qywxID", ""), beego.AppConfig.DefaultString("qywxSecret", ""), "") TiktokApi = tiktok.New(beego.AppConfig.DefaultString("tiktokAppSecret", ""), beego.AppConfig.DefaultString("tiktokAppKey", "")) //TiktokJXDJApi = tiktok.New(beego.AppConfig.DefaultString("tiktokJXDJSecret", ""), beego.AppConfig.DefaultString("tiktokJXDJKey", "")) - if TiktokJXDJApiID = beego.AppConfig.DefaultString("tiktokJXDJKey", ""); TiktokJXDJApiID != "" { - TiktokJXDJApi = tiktok.New(TiktokJXDJApiID, beego.AppConfig.DefaultString("tiktokJXDJSecret", "")) + if tiktokJXDJApiID = beego.AppConfig.DefaultString("tiktokJXDJApiID", ""); tiktokJXDJApiID != "" { + TiktokJXDJApi = tiktok.New(tiktokJXDJApiID, beego.AppConfig.DefaultString("tiktokJXDJSecret", "")) } // 国美aip GuoMeiApi = gomei.New(beego.AppConfig.DefaultString("gomeiAppKey", ""), beego.AppConfig.DefaultString("gomeiAppSecret", ""), "") From 77c44a2d7505700ae8f51b65d00ff33db114ebc0 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 17:42:26 +0800 Subject: [PATCH 49/57] tt --- conf/app.conf | 8 ++++---- globals/api/api.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/app.conf b/conf/app.conf index e84acb4f6..a5c49e6a3 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -211,7 +211,7 @@ tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 -tiktokJXDJApiID="ttaceeda5333d7a7ab01" +TiktokJXDJApiID="ttaceeda5333d7a7ab01" tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4" #国美 gomeiAppKey = "N0R033L2QQFR53" @@ -337,7 +337,7 @@ tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 -tiktokJXDJApiID="ttaceeda5333d7a7ab01" +TiktokJXDJApiID="ttaceeda5333d7a7ab01" tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4" #国美 gomeiAppKey = "N0R033L2QQFR53" @@ -443,7 +443,7 @@ tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 -tiktokJXDJApiID="ttaceeda5333d7a7ab01" +TiktokJXDJApiID="ttaceeda5333d7a7ab01" tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4" #国美 gomeiAppKey = "N0R033L2QQFR53" @@ -632,7 +632,7 @@ tiktokAppKey = "tta6a1d01c399f264201" tiktokAppSecret = "5c08a0465cf0f996af254a03b6c2548defef87ad" tiktokJXDJKey="ttaceeda5333d7a7ab01" #京西到家抖音小程序 -tiktokJXDJApiID="ttaceeda5333d7a7ab01" +TiktokJXDJApiID="ttaceeda5333d7a7ab01" tiktokJXDJSecret="5c8492ec2744fb72bb6cc356983f3cfc317f85d4" #国美 gomeiAppKey = "N0R033L2QQFR53" diff --git a/globals/api/api.go b/globals/api/api.go index 0d9485fcc..1c3785b21 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -115,7 +115,7 @@ var ( TiktokApi *tiktok.API // 抖音api TiktokJXDJApi *tiktok.API //抖音京西到家api TiktokApiID string //抖音商城ID - tiktokJXDJApiID string //抖音京西到家ID + TiktokJXDJApiID string //抖音京西到家ID GuoMeiApi *gomei.API // 国美api EnterpriseChatHeadApi *enterprise.API // 企业微信api @@ -305,8 +305,8 @@ func Init() { QywxAPI = qywxapi.New(beego.AppConfig.DefaultString("qywxID", ""), beego.AppConfig.DefaultString("qywxSecret", ""), "") TiktokApi = tiktok.New(beego.AppConfig.DefaultString("tiktokAppSecret", ""), beego.AppConfig.DefaultString("tiktokAppKey", "")) //TiktokJXDJApi = tiktok.New(beego.AppConfig.DefaultString("tiktokJXDJSecret", ""), beego.AppConfig.DefaultString("tiktokJXDJKey", "")) - if tiktokJXDJApiID = beego.AppConfig.DefaultString("tiktokJXDJApiID", ""); tiktokJXDJApiID != "" { - TiktokJXDJApi = tiktok.New(tiktokJXDJApiID, beego.AppConfig.DefaultString("tiktokJXDJSecret", "")) + if TiktokJXDJApiID = beego.AppConfig.DefaultString("TiktokJXDJApiID", ""); TiktokJXDJApiID != "" { + TiktokJXDJApi = tiktok.New(TiktokJXDJApiID, beego.AppConfig.DefaultString("tiktokJXDJSecret", "")) } // 国美aip GuoMeiApi = gomei.New(beego.AppConfig.DefaultString("gomeiAppKey", ""), beego.AppConfig.DefaultString("gomeiAppSecret", ""), "") From 731a3035a06c8d0baa52423c946919755d8e3fce Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 17:51:06 +0800 Subject: [PATCH 50/57] tt --- globals/api/api.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/globals/api/api.go b/globals/api/api.go index 1c3785b21..1211f5fe3 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -305,8 +305,8 @@ func Init() { QywxAPI = qywxapi.New(beego.AppConfig.DefaultString("qywxID", ""), beego.AppConfig.DefaultString("qywxSecret", ""), "") TiktokApi = tiktok.New(beego.AppConfig.DefaultString("tiktokAppSecret", ""), beego.AppConfig.DefaultString("tiktokAppKey", "")) //TiktokJXDJApi = tiktok.New(beego.AppConfig.DefaultString("tiktokJXDJSecret", ""), beego.AppConfig.DefaultString("tiktokJXDJKey", "")) - if TiktokJXDJApiID = beego.AppConfig.DefaultString("TiktokJXDJApiID", ""); TiktokJXDJApiID != "" { - TiktokJXDJApi = tiktok.New(TiktokJXDJApiID, beego.AppConfig.DefaultString("tiktokJXDJSecret", "")) + if TiktokJXDJApiID = beego.AppConfig.DefaultString("tiktokJXDJSecretTiktokJXDJApiID", ""); TiktokJXDJApiID != "" { + TiktokJXDJApi = tiktok.New(TiktokJXDJApiID, beego.AppConfig.DefaultString("TiktokJXDJApiID", "")) } // 国美aip GuoMeiApi = gomei.New(beego.AppConfig.DefaultString("gomeiAppKey", ""), beego.AppConfig.DefaultString("gomeiAppSecret", ""), "") From 066370595a65f747af93802f76a7d0dc29012850 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 17:53:19 +0800 Subject: [PATCH 51/57] tt --- globals/api/api.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/globals/api/api.go b/globals/api/api.go index 1211f5fe3..ada5463a0 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -305,8 +305,8 @@ func Init() { QywxAPI = qywxapi.New(beego.AppConfig.DefaultString("qywxID", ""), beego.AppConfig.DefaultString("qywxSecret", ""), "") TiktokApi = tiktok.New(beego.AppConfig.DefaultString("tiktokAppSecret", ""), beego.AppConfig.DefaultString("tiktokAppKey", "")) //TiktokJXDJApi = tiktok.New(beego.AppConfig.DefaultString("tiktokJXDJSecret", ""), beego.AppConfig.DefaultString("tiktokJXDJKey", "")) - if TiktokJXDJApiID = beego.AppConfig.DefaultString("tiktokJXDJSecretTiktokJXDJApiID", ""); TiktokJXDJApiID != "" { - TiktokJXDJApi = tiktok.New(TiktokJXDJApiID, beego.AppConfig.DefaultString("TiktokJXDJApiID", "")) + if TiktokJXDJApiID = beego.AppConfig.DefaultString("TiktokJXDJApiID", ""); TiktokJXDJApiID != "" { + TiktokJXDJApi = tiktok.New("tiktokJXDJSecret", beego.AppConfig.DefaultString("TiktokJXDJApiID", "")) } // 国美aip GuoMeiApi = gomei.New(beego.AppConfig.DefaultString("gomeiAppKey", ""), beego.AppConfig.DefaultString("gomeiAppSecret", ""), "") From bd829c056d5cdf862b679c4afa329f35a44e4fef Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 18 Aug 2022 17:57:16 +0800 Subject: [PATCH 52/57] tt --- globals/api/api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/globals/api/api.go b/globals/api/api.go index ada5463a0..337e15f11 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -306,7 +306,7 @@ func Init() { TiktokApi = tiktok.New(beego.AppConfig.DefaultString("tiktokAppSecret", ""), beego.AppConfig.DefaultString("tiktokAppKey", "")) //TiktokJXDJApi = tiktok.New(beego.AppConfig.DefaultString("tiktokJXDJSecret", ""), beego.AppConfig.DefaultString("tiktokJXDJKey", "")) if TiktokJXDJApiID = beego.AppConfig.DefaultString("TiktokJXDJApiID", ""); TiktokJXDJApiID != "" { - TiktokJXDJApi = tiktok.New("tiktokJXDJSecret", beego.AppConfig.DefaultString("TiktokJXDJApiID", "")) + TiktokJXDJApi = tiktok.New(beego.AppConfig.DefaultString("tiktokJXDJSecret", ""), beego.AppConfig.DefaultString("TiktokJXDJApiID", "")) } // 国美aip GuoMeiApi = gomei.New(beego.AppConfig.DefaultString("gomeiAppKey", ""), beego.AppConfig.DefaultString("gomeiAppSecret", ""), "") From 1119562af1910910bad7e1aa94303257f3dacdd1 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 19 Aug 2022 09:19:07 +0800 Subject: [PATCH 53/57] tt --- business/partner/purchase/jx/localjx/order.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index ccb796527..43bcf7b79 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -326,7 +326,7 @@ func Pay4Order(ctx *jxcontext.Context, orderID int64, payType int, vendorPayType err = dao.CreateEntity(dao.GetDB(), orderPay) } case model.PayTypeTL: - if subAppID == tiktok.TiktokAppId { + if subAppID == tiktok.TiktokAppId || subAppID == tiktok.TiktokJXDJAppID { subAppID = model.JXC4AppId // 京西商城 } if orderPay, err = pay4OrderByTL(ctx, order, payType, vendorPayType, subAppID); err == nil && orderPay != nil { @@ -605,7 +605,7 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) { if err != nil { return err } - partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, storeBrandId, storeOrder.ActualPayPrice, model.BrandBillFeeTypeSys, model.BrandBillFeeTypeSys, "","") + partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, storeBrandId, storeOrder.ActualPayPrice, model.BrandBillFeeTypeSys, model.BrandBillFeeTypeSys, "", "") } } case model.PayTypeTL_BrandBillCharge: @@ -616,7 +616,7 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) { brandOrder.OrderFinishedAt = time.Now() brandOrder.Status = model.OrderStatusFinished if _, err = dao.UpdateEntity(dao.GetDB(), brandOrder, "OrderFinishedAt", "Status"); err == nil { - partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, brandOrder.BrandID, brandOrder.ActualPayPrice, model.BrandBillTypeIncome, model.BrandBillFeeTypeCharge, orderPay.VendorOrderID,"") + partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, brandOrder.BrandID, brandOrder.ActualPayPrice, model.BrandBillTypeIncome, model.BrandBillFeeTypeCharge, orderPay.VendorOrderID, "") } } default: From 21280bd4ba6e66436c85dddaf7891e56abf30d02 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 19 Aug 2022 09:44:05 +0800 Subject: [PATCH 54/57] =?UTF-8?q?tl=20=E6=94=AF=E4=BB=98=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jx/localjx/tonglianpay.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/purchase/jx/localjx/tonglianpay.go b/business/partner/purchase/jx/localjx/tonglianpay.go index d63413eac..c1f198d9d 100644 --- a/business/partner/purchase/jx/localjx/tonglianpay.go +++ b/business/partner/purchase/jx/localjx/tonglianpay.go @@ -45,6 +45,7 @@ func pay4OrderByTL(ctx *jxcontext.Context, order *model.GoodsOrder, payType int, if err == nil && authInfo.GetAuthType() == weixin.AuthTypeMini && authInfo.GetAuthTypeID() == subAppID { param.Acct = authInfo.GetAuthID() } + globals.SugarLogger.Debug("authInfo,param.Acc=======================", authInfo, param.Acct) } if vendorPayType == tonglianpayapi.PayTypeZfbJS || vendorPayType == tonglianpayapi.PayTypeZfbApp { if authInfo, err := ctx.GetV2AuthInfo(); err == nil { From b869137bf44fd2e1ffd5a2ed4ec6b7fc1ba74eeb Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 19 Aug 2022 09:55:39 +0800 Subject: [PATCH 55/57] =?UTF-8?q?tl=20=E6=94=AF=E4=BB=98=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jx/localjx/order.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 43bcf7b79..5e8a61af9 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -3,7 +3,6 @@ package localjx import ( "errors" "fmt" - "git.rosy.net.cn/baseapi/platformapi/tiktok" "math" "regexp" "strings" @@ -326,9 +325,9 @@ func Pay4Order(ctx *jxcontext.Context, orderID int64, payType int, vendorPayType err = dao.CreateEntity(dao.GetDB(), orderPay) } case model.PayTypeTL: - if subAppID == tiktok.TiktokAppId || subAppID == tiktok.TiktokJXDJAppID { - subAppID = model.JXC4AppId // 京西商城 - } + //if subAppID == tiktok.TiktokAppId || subAppID == tiktok.TiktokJXDJAppID { + // subAppID = model.JXC4AppId // 京西商城 + //} if orderPay, err = pay4OrderByTL(ctx, order, payType, vendorPayType, subAppID); err == nil && orderPay != nil { dao.WrapAddIDCULDEntity(orderPay, ctx.GetUserName()) err = dao.CreateEntity(dao.GetDB(), orderPay) From 4aa4c296068a47afc9292a2a939af6fd83155661 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 19 Aug 2022 10:03:18 +0800 Subject: [PATCH 56/57] =?UTF-8?q?tl=20=E6=94=AF=E4=BB=98=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jx/localjx/tonglianpay.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/jx/localjx/tonglianpay.go b/business/partner/purchase/jx/localjx/tonglianpay.go index c1f198d9d..e29568787 100644 --- a/business/partner/purchase/jx/localjx/tonglianpay.go +++ b/business/partner/purchase/jx/localjx/tonglianpay.go @@ -45,7 +45,8 @@ func pay4OrderByTL(ctx *jxcontext.Context, order *model.GoodsOrder, payType int, if err == nil && authInfo.GetAuthType() == weixin.AuthTypeMini && authInfo.GetAuthTypeID() == subAppID { param.Acct = authInfo.GetAuthID() } - globals.SugarLogger.Debug("authInfo,param.Acc=======================", authInfo, param.Acct) + globals.SugarLogger.Debug("authInfo=======================", authInfo) + globals.SugarLogger.Debug("param.Acc=======================", param.Acct) } if vendorPayType == tonglianpayapi.PayTypeZfbJS || vendorPayType == tonglianpayapi.PayTypeZfbApp { if authInfo, err := ctx.GetV2AuthInfo(); err == nil { From 389e35399e7e89587480d8d404a03c6fcb35e290 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 19 Aug 2022 10:32:26 +0800 Subject: [PATCH 57/57] =?UTF-8?q?tl=20=E6=94=AF=E4=BB=98=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jx/localjx/order.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 5e8a61af9..43bcf7b79 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -3,6 +3,7 @@ package localjx import ( "errors" "fmt" + "git.rosy.net.cn/baseapi/platformapi/tiktok" "math" "regexp" "strings" @@ -325,9 +326,9 @@ func Pay4Order(ctx *jxcontext.Context, orderID int64, payType int, vendorPayType err = dao.CreateEntity(dao.GetDB(), orderPay) } case model.PayTypeTL: - //if subAppID == tiktok.TiktokAppId || subAppID == tiktok.TiktokJXDJAppID { - // subAppID = model.JXC4AppId // 京西商城 - //} + if subAppID == tiktok.TiktokAppId || subAppID == tiktok.TiktokJXDJAppID { + subAppID = model.JXC4AppId // 京西商城 + } if orderPay, err = pay4OrderByTL(ctx, order, payType, vendorPayType, subAppID); err == nil && orderPay != nil { dao.WrapAddIDCULDEntity(orderPay, ctx.GetUserName()) err = dao.CreateEntity(dao.GetDB(), orderPay)